# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2010-02-19 22:50:29
# Node ID 9deea2412c8449edd54e75cded6ea98554160ce2
# Parent  f3bdda07aba9dce5df9462e3764e918b258e047e

fix mysqlResultFree() segfault issue, actually works finally :-D

diff --git a/src/server/mysql.c b/src/server/mysql.c
--- a/src/server/mysql.c
+++ b/src/server/mysql.c
@@ -239,7 +239,7 @@ int mysqlResultFree(distrend_mysql_conn_
      Must flush the resultset buffer.
    */
   for(counter = 0;
-      mysql_fetch_row(result->mysqlresult);
+      mysql_fetch_row(mysqlresult);
       counter ++)
     ;
   if(counter)
@@ -248,10 +248,14 @@ int mysqlResultFree(distrend_mysql_conn_
   while(mysql_more_results(conn->mysqlconn))
     {
       fprintf(stderr, "flushing an extraneous result set\n");
+      mysql_next_result(conn->mysqlconn);
       mysqlresult = mysql_use_result(conn->mysqlconn);
-      while(mysql_fetch_row(mysqlresult))
-	;
-      mysql_free_result(mysqlresult);
+      if(mysqlresult)
+	{
+	  while(mysql_fetch_row(mysqlresult))
+	    ;
+	  mysql_free_result(mysqlresult);
+	}
     }
 
   return 0;