bzr push into mysql-trunk-mtr branch (bjorn.munch:2973 to 2974)

[Bjorn Munch]

 2974 Bjorn Munch	2010-10-01 [merge]
      upmerge 20304

    modified:
      client/mysqltest.cc
 2973 Bjorn Munch	2010-09-30 [merge]
      upmerge 52828

    modified:
      .bzr-mysql/default.conf
      client/mysqltest.cc
      mysql-test/mysql-test-run.pl
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-30 10:55:39 +0000
+++ b/client/mysqltest.cc	2010-10-01 13:56:59 +0000
@@ -7431,6 +7431,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]