DistRen Changeset - 868944ab533c · protofusion repositories

Changeset - 868944ab533c

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca@protofusion.org - 16 years ago 2010-02-18 21:23:02
ethanzonca@protofusion.org

Debug/fixes

1 file changed with 9 insertions and 1 deletions:

src/server/mysql.c

0 comments (0 inline, 0 general)

src/server/mysql.c

➞

Show inline comments

@@ @@ -82,32 +82,34 @@ struct distrend_mysql_result @@
  */
 int mysqlConnect(distrend_mysql_conn_t *conn)
+{
   MYSQL *mysqlconn;
   char *server = "zserver1";
   char *user = "distren";
   char *password = "HwLxuBqTvJ6J7FWj";
   char *database = "distren";
   mysqlconn = mysql_init(NULL);
   mysql_options(mysqlconn, MYSQL_OPT_RECONNECT,"true");
   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
   *conn = malloc(sizeof(struct distrend_mysql_conn));
   if(!*conn)
+    {
       mysql_close(mysqlconn);
       mysql_server_end();
       return 2;
+    }
   (*conn)->mysqlconn = mysqlconn;
   (*conn)->pointlesscheck = SEVENTY_FIVE;
   return 0;
+}
@@ @@ -137,31 +139,37 @@ distrend_mysql_result_t mysqlQuery(distr @@
+{
   MYSQL_RES *result;
   distrend_mysql_result_t distrenresult;
   /**
      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 _was_ broken or may be broken, I'm not sure exactly what this return value means\n");
   fprintf(stderr,"Querying... ");
   if (mysql_query(conn->mysqlconn, query))
      fprintf(stderr, "%s\n", mysql_error(conn->mysqlconn));
   fprintf(stderr,"Queried!\n");
   fprintf(stderr,"Getting results... ");
   result = mysql_use_result(conn->mysqlconn);
   fprintf(stderr,"Done!\n");
   distrenresult = malloc(sizeof(struct distrend_mysql_result));
   if(!distrenresult)
+    {
       mysql_free_result(result);
       return NULL;
+    }
   distrenresult->mysqlresult = result;
   distrenresult->pointlesscheck = FORTY_TWO;
   return distrenresult;

0 comments (0 inline, 0 general)