Changeset 45f2d70c376339f71f20b78275ce5618a7be4910

Timestamp:

03/14/11 23:04:01 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1300143841 +0000

git-parent:

[e9dea15c596d028be11696594b9a5653665a4d2d]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1300143841 +0000

Message:

attempt to free and disconnect in the asynch portion of the code

Files:

• src/modules/mysql.c (modified) (2 diffs)

src/modules/mysql.c

@@ -187 +187 @@
-
-#define AVAIL_BAIL(str) do { \
+  MYSQL *conn_swap = ci->conn; \
+  MYSQL_RES *result_swap = ci->result; \
+  if(ci->result) { \
+    ci->result = NULL; \
+    mysql_free_result(result_swap); \
+  } \
+  if(ci->conn) { \
+    ci->conn = NULL; \
+    mysql_close(conn_swap); \
+  } \
-  ci->timed_out = 0; \
-  ci->error = strdup(str); \
@@ -321 +331 @@
-      ci->rv = mysql_num_rows(ci->result);
-      mysql_ingest_stats(ci);
+      if(ci->result) {
+        MYSQL_RES *result_swap = ci->result;
+        ci->result = NULL;
+        mysql_free_result(result_swap);
+      }
+      if(ci->conn) {
+        MYSQL *conn_swap = ci->conn;
+        ci->conn = NULL;
+        mysql_close(conn_swap);
+      }
-      ci->timed_out = 0;
-      return 0;