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

support flushing more of the SQL result sets

diff --git a/src/server/mysql.c b/src/server/mysql.c
--- a/src/server/mysql.c
+++ b/src/server/mysql.c
@@ -51,7 +51,7 @@ distrend_mysql_result_t mysqlQuery(distr
    check if it returned NULL or not.
    @return 0 on success
  */
-int mysqlResultFree(distrend_mysql_result_t result);
+int mysqlResultFree(distrend_mysql_conn_t conn, distrend_mysql_result_t result);
 
 /**
    reads an integer mysql field value
@@ -218,9 +218,10 @@ distrend_mysql_result_t mysqlQuery(distr
   return distrenresult;
 }
 
-int mysqlResultFree(distrend_mysql_result_t result)
+int mysqlResultFree(distrend_mysql_conn_t conn, distrend_mysql_result_t result)
 {
   size_t counter;
+  MYSQL_RES *mysqlresult;
 
   if(!result)
     {
@@ -231,6 +232,9 @@ int mysqlResultFree(distrend_mysql_resul
   if(result->pointlesscheck != FORTY_TWO)
     fprintf(stderr, "%s:%d: I didn't get the type of handle I wanted\n", __FILE__, __LINE__);
 
+  mysqlresult = result->mysqlresult;
+  free(result);
+
   /**
      Must flush the resultset buffer.
    */
@@ -241,8 +245,14 @@ int mysqlResultFree(distrend_mysql_resul
   if(counter)
     fprintf(stderr, "Calling function did not flush %d rows\n", (int)counter);
 
-  mysql_free_result(result->mysqlresult);
-  free(result);
+  while(mysql_more_results(conn->mysqlconn))
+    {
+      fprintf(stderr, "flushing an extraneous result set\n");
+      mysqlresult = mysql_use_result(conn->mysqlconn);
+      while(mysql_fetch_row(mysqlresult))
+	;
+      mysql_free_result(mysqlresult);
+    }
 
   return 0;
 }
@@ -301,14 +311,14 @@ int find_jobframe(distrend_mysql_conn_t 
   row = mysql_fetch_row(result->mysqlresult);
   if(!row)
     {
-      mysqlResultFree(result);
+      mysqlResultFree(conn, result);
       return 1;
     }
 
   rtn = distrend_mysql_getint(row, 0, (int32_t *)jobkey);
   rtn += distrend_mysql_getint(row, 1, framenum);
   
-  mysqlResultFree(result);
+  mysqlResultFree(conn, result);
 
   return rtn;
 }