DistRen Changeset - 3479dcafbf12 · protofusion repositories

Changeset - 3479dcafbf12

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Nathan Brink (binki) - 16 years ago 2010-02-19 21:35:14
ohnobinki@ohnopublishing.net

Better handle error situations, properly set MYSQL_OPT_RECONNECT

1 file changed with 15 insertions and 5 deletions:

src/server/mysql.c

0 comments (0 inline, 0 general)

src/server/mysql.c

➞

Show inline comments

@@ @@ -84,33 +84,39 @@ struct distrend_mysql_result @@
     funcs
  */
 int mysqlConnect(distrend_mysql_conn_t *conn)
+{
   MYSQL *mysqlconn;
   char *server = "zserver1";
   char *user = "distren";
   char *password = "HwLxuBqTvJ6J7FWj";
   char *database = "distren";
   my_bool mybool;
   mysqlconn = mysql_init(NULL);
   if(!mysql_real_connect(mysqlconn, server, user, password, database, 0, NULL, CLIENT_MULTI_STATEMENTS))
+    {
       fprintf(stderr, "%s\n", mysql_error(mysqlconn));
       return 1;
+    }
   mysql_options(mysqlconn, MYSQL_OPT_RECONNECT,"true"); // After mysql_real_connect due to bug fixed in MySQL 5.1.6 and later
   /**
      Called after mysql_real_connect() due to bug fixed in MySQL 5.1.6 and later
   */
   mybool = 1;
   mysql_options(mysqlconn, MYSQL_OPT_RECONNECT, (char *)&mybool);
   *conn = malloc(sizeof(struct distrend_mysql_conn));
   if(!*conn)
+    {
       mysql_close(mysqlconn);
       mysql_server_end();
       return 2;
+    }
   (*conn)->mysqlconn = mysqlconn;
   (*conn)->pointlesscheck = SEVENTY_FIVE;
@@ @@ -145,30 +151,34 @@ distrend_mysql_result_t mysqlQuery(distr @@
   MYSQL_FIELD_OFFSET num_columns;
   /**
      pointless sanity check
   */
   if(conn->pointlesscheck != SEVENTY_FIVE)
     fprintf(stderr, "warning, I was passed a bad struct distrend_mysql_conn...\n");
   /** make sure that connection is still alive
    */
   if(mysql_ping(conn->mysqlconn))
     fprintf(stderr, "MySQL connection broken, and reconnect is disabled!\n");
+    {
       fprintf(stderr, "MySQL connection broken, and reconnect is disabled!\n");
+    }
   fprintf(stderr,"Querying... ");
   if (mysql_query(conn->mysqlconn, query))
      fprintf(stderr, "%s\n", mysql_error(conn->mysqlconn));
+    {
       fprintf(stderr, "calling mysql_query() resulted in: %s\n", mysql_error(conn->mysqlconn));
       return NULL;
+    }
   fprintf(stderr,"Queried!\n");
   fprintf(stderr,"Getting results... ");
   result = mysql_use_result(conn->mysqlconn);
   /**
      Flush stuff out when an empty set is expected.
    */
   if(!expected_columns)
+    {
       while(mysql_fetch_row(result))
+	;
@@ @@ -214,25 +224,25 @@ 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__);
   /**
      Must flush the resultset buffer.
    */
   for(counter = 0;
       mysql_fetch_row(result->mysqlresult);
       counter ++)
+    ;
   if(counter)
-    fprintf(stderr, "Calling function did not flush all of the rows it should've\n");
+    fprintf(stderr, "Calling function did not flush %d rows\n", (int)counter);
   mysql_free_result(result->mysqlresult);
   free(result);
   return 0;
+}
 /*
    Individual query functions:
  */
 void finish_frame(distrend_mysql_conn_t conn, int32_t slavekey, int32_t jobkey, int32_t framenum)

0 comments (0 inline, 0 general)