bzr push into mysql-5.1-mtr branch (bjorn.munch:2938 to 2939) Bug#20304

[Bjorn Munch]

 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
 2938 Bjorn Munch	2010-09-30
      Bug #52828 Tests that use perl fail when perl is not in path
      Trying to run perl fails, just like it does when perl is started but fails
      Trap the case that perl was not found/could not be started, and skip test
      Also force a restart of servers since test may already have done something
      mtr now also appends path of current perl to PATH to aid mysqltest

    modified:
      client/mysqltest.cc
      mysql-test/mysql-test-run.pl
=== 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/[e-mail]