Merge lp:~linuxjedi/drizzle/drizzle-bug-550251 into lp:~drizzle-trunk/drizzle/development

[Andrew Hutchings]

If an error occurred during results fetch in drizzle client the result set was not freed correctly ending in segfault upon client end.

=== modified file 'client/drizzle.cc'
--- client/drizzle.cc	2010-08-28 19:47:15 +0000
+++ client/drizzle.cc	2010-09-07 21:01:40 +0000
@@ -2764,7 +2764,11 @@
     return 0;
 
   if (drizzle_con_error(&con)[0])
-    return put_error(&con, result);
+  {
+    int ret= put_error(&con, result);
+    drizzle_result_free(result);
+    return ret;
+  }
   return 0;
 }