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

various small mysql.c fixes

diff --git a/src/server/mysql.c b/src/server/mysql.c
--- a/src/server/mysql.c
+++ b/src/server/mysql.c
@@ -161,7 +161,8 @@ distrend_mysql_result_t mysqlQuery(distr
   
   if(mysql_ping(conn->mysqlconn))
     {
-      fprintf(stderr, "MySQL connection broken, and reconnect is disabled!\n");
+      fprintf(stderr, "mysql_ping() failed: %s\n", mysql_error(conn->mysqlconn));
+      return NULL;
     }
 
   fprintf(stderr,"Querying... ");
@@ -205,6 +206,8 @@ distrend_mysql_result_t mysqlQuery(distr
   distrenresult = malloc(sizeof(struct distrend_mysql_result));
   if(!distrenresult)
     {
+      while(mysql_fetch_row(result))
+	;
       mysql_free_result(result);
       return NULL;
     }
@@ -220,8 +223,11 @@ int mysqlResultFree(distrend_mysql_resul
   size_t counter;
 
   if(!result)
-    return 0;
-
+    {
+      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__);