List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:October 1 2010 9:01am
Subject:bzr commit into mysql-5.1-mtr branch (bjorn.munch:2939) Bug#20304
View as plain text  
#At file:///home/bm136801/my/hangreap-51/ based on revid:bjorn.munch@stripped

 2939 Bjorn Munch	2010-10-01
      Bug #20304 mysqltest: reap with no preceding statement hangs forever
      Added sanity check, similar to the one preventing send without reap

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-30 10:42:37 +0000
+++ b/client/mysqltest.cc	2010-10-01 09:00:18 +0000
@@ -7370,6 +7370,9 @@ void run_query(struct st_connection *cn,
   if (cn->pending && (flags & QUERY_SEND_FLAG))
     die ("Cannot run query on connection between send and reap");
 
+  if (!(flags & QUERY_SEND_FLAG) && !cn->pending)
+    die ("Cannot reap on a connection without pending send");
+  
   init_dynamic_string(&ds_warnings, NULL, 0, 256);
   /*
     Evaluate query if this is an eval command


Attachment: [text/bzr-bundle] bzr/bjorn.munch@oracle.com-20101001090018-i7m31uqahrrvfvf9.bundle
Thread
bzr commit into mysql-5.1-mtr branch (bjorn.munch:2939) Bug#20304Bjorn Munch1 Oct