From: Bjorn Munch
Date: October 1 2010 2:02pm
Subject: bzr push into mysql-5.1-mtr branch (bjorn.munch:2938 to 2939) Bug#20304
List-Archive: http://lists.mysql.com/commits/119697
X-Bug: 20304
Message-Id: <201010011402.o91E2Q4g024040@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0186142436=="

--===============0186142436==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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


--===============0186142436==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/hangreap-51/
# testament_sha1: fe37d0a680645e394bb8b73bc6e0b0acd2d51225
# timestamp: 2010-10-01 16:02:26 +0200
# base_revision_id: bjorn.munch@stripped\
#   ux0kz51nq658y58p
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd9AH7AAAZVfgEAQeWf//3+H
OiC////wUAPDxlO4Nbc1RhKIQaI9QNAyp5T0aZoSbEm1NDaZT0yQEokyBHknpPUyEGgaAAABoABJ
ITJNooaeUaGmj0jTQAAAAAOYBMBMjACMTEwmEwQ0xNMBJKekNMk0JptNGqep6npPFGnpNDQA0ANG
WqhnHF6LejqtX3HOl0dkDkxzWVKyqCMVSj1/k1v8wweuVRV5+x0dGLhtxNLjuMttf77Quc3Qv8q7
1imap0uVzDW4fSaFaSSvuSaIY6qruPFFL4o17EH41DQtzZ6XqbR0EMVFFt4lEOBpMb3C+upYpEUj
O1b3wFqbcWDigJhOwDCHOIMJ2E47g5ODicOJuTqnQpVQ/wWTRZC+oEeRhH6NPCZW+umUWI1ZI5xu
C7jZKjkZyrtmJbvPTBgtrYKFYi3rfeq84qiF3PinhmJVA1112HN+k+MJKFTs0x8pfbTWYYA6txuC
QZQ+IwJI+E040lShgfZ4GQelkNoLY3y0kYbzRMJTtxltzk7lCAQbIz6ApCxo4dMNi8ZAwTrQYz8D
HGeyxGwaYaxqmAaG8xhozpUSbKzJFtlCOlWJ/GEB5CgYs1OuQiBEkMpiYe4VtmGAZY1DW4c09Ssx
Rc9GlKi57oRYRsRXK4kCORd0N5Pkm04Gqd/DP3akQ955VVFOOgfzi+Ovzy6UTKruvbr84MVlDlQ0
nYGrPrPtw+6ITTMDVvE3QhFZJOzwhNOhmHru1+ZoPEXyzoVngKzqukJdxt8htjdlgb2qSxw/2H6I
Jk7qXNYiG3jMiF6STiKPPO/m4aYRo0iS2NcmIftyXe3eSxrW/ouiuJgJlsj6Mt6dxr0weVsnmB/E
gsNqVzM+W3Es27T3wVcn2wjsFZLLaeIKi23006qqanAuEmEajeMS3SrMWrSFwqZXrvuIpzZT4fFL
E0lgTY4GM6HM1+qyFjCVMHQzPJCmnFvELYJu7E1+SVjzRs3o4jO4HtoSWTG51IZA06kfHET4unQi
GnMkbrg138g1htyBkcNkCaQxIoxv27Qs6xHaJoqueM1hVTA9KRgevfGUTM1CQyhlkyRaVgxTizop
JM7V0ZwkBJky3y6i+uwFgkhuF8D8SIhSH8C43qrL5TMF+Ku1Myc6wfsjPVzpI2hAV3ortDVcMppL
lNc0ooaivLEp3mqIpK6FNwo0YhMqyVOCLEzI034worXLd3NuD1ExWSRLRhgZ6DMEKPwOM+XiEhrK
GIR6Zkt9cwcKWUTo55zf4dSRZxFcaw3l6yJrBXCoDiZkywwF0HOpYR6mOIWnSaA85zNZEL8bjJ2F
Fh/i7kinChIb6AP2AA==


--===============0186142436==--