DistRen Changeset - f3bdda07aba9 · protofusion repositories

Changeset - f3bdda07aba9

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2010-02-19 22:45:45
ohnobinki@ohnopublishing.net

support flushing more of the SQL result sets

1 file changed with 16 insertions and 6 deletions:

src/server/mysql.c

0 comments (0 inline, 0 general)

src/server/mysql.c

➞

Show inline comments

@@ @@ -48,13 +48,13 @@ distrend_mysql_result_t mysqlQuery(distr @@
 /**
    frees mysql query result. Accepts a NULL pointer and ignores it to
    help deal with one-shot calls to mysqlQuery so that you don't have to
    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
    @return 0 on success
 */
 int distrend_mysql_getint(MYSQL_ROW row, MYSQL_FIELD_OFFSET column, int32_t *theint)
@@ @@ -215,37 +215,47 @@ distrend_mysql_result_t mysqlQuery(distr @@
   distrenresult->mysqlresult = result;
   distrenresult->pointlesscheck = FORTY_TWO;
   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)
+    {
       fprintf(stderr, "mysqlResultFree(): warning, passed NULL parameter\n");
       return 0;
+    }
   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.
    */
   for(counter = 0;
       mysql_fetch_row(result->mysqlresult);
       counter ++)
+    ;
   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;
+}
 /*
    Individual query functions:
@@ @@ -298,17 +308,17 @@ int find_jobframe(distrend_mysql_conn_t @@
   if(!result)
     return 1;
   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;
+}

0 comments (0 inline, 0 general)