bzr commit into MySQL/Maria:mysql-maria branch (guilhem:2739) Bug#43001

[Guilhem Bichot]

#At bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-maria/ based on revid:guilhem@stripped

 2739 Guilhem Bichot	2009-03-16
      Fix for BUG#43001 ""maria.maria-no-logging fails sporadically on valgrind in PS mode"
      mysqltest was reading free-ed memory, which fooled the test's reconnection detection.
     @ client/mysqltest.cc
        Fix for BUG#43001 ""maria.maria-no-logging fails sporadically on valgrind in PS mode"
        mysqltest was closing (=>free()ing) the "stmt" object before reading stmt->last_errno
        (and storing that into $mysql_errno). As wait_until_connected_again.inc tests the value
        of $mysql_errno to know if reconnection has been accomplished, it was fooled.

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2009-03-11 15:32:42 +0000
+++ b/client/mysqltest.cc	2009-03-16 10:09:22 +0000
@@ -6859,14 +6859,6 @@ end:
     dynstr_free(&ds_execute_warnings);
   }
 
-
-  /* Close the statement if - no reconnect, need new prepare */
-  if (mysql->reconnect)
-  {
-    mysql_stmt_close(stmt);
-    cur_con->stmt= NULL;
-  }
-
   /*
     We save the return code (mysql_stmt_errno(stmt)) from the last call sent
     to the server into the mysqltest builtin variable $mysql_errno. This
@@ -6875,6 +6867,13 @@ end:
 
   var_set_errno(mysql_stmt_errno(stmt));
 
+  /* Close the statement if reconnect, need new prepare */
+  if (mysql->reconnect)
+  {
+    mysql_stmt_close(stmt);
+    cur_con->stmt= NULL;
+  }
+
   DBUG_VOID_RETURN;
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]