From: Bjorn Munch
Date: October 1 2010 1:56pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3097)
List-Archive: http://lists.mysql.com/commits/119690
Message-Id: <201010011356.o91DuKsY023888@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0020612087=="

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

#At file:///home/bm136801/my/mtr-55/ based on revid:bjorn.munch@stripped

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

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-30 10:53:36 +0000
+++ b/client/mysqltest.cc	2010-10-01 13:55:49 +0000
@@ -7427,6 +7427,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


--===============0020612087==
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/mtr-55/
# testament_sha1: 303f1077353951aadf16d8a00cce34169aabe73c
# timestamp: 2010-10-01 15:56:20 +0200
# source_branch: file:///home/bm136801/my/mysql-5.5/
# base_revision_id: bjorn.munch@stripped\
#   q19eozae1v9mate8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZOAOzIAAyzfgEAQeWf//3+H
OiC////wUAX6rwAAJFUABQJREaDSQ2Jpqeo0eoybUAAaAwCBzAJgJkYARiYmEwmCGmJpgNQEaJoy
Yj1D1AAAAANMgAcwCYCZGAEYmJhMJghpiaYBVIhoIwgBJtJhKfoanonqIA9TQyNqUzwPsAPIncVZ
ixhVVkK0gTNsU0/AQjJ5iElaO26kIcKlpE3gRqqVZtN6f3mrMxWKCqq6PoNUA4hVmFjJ8ctEiEhq
IxSmOqQPCEv3q8IpkCiuWGMPMdsICraDDIgBxgwq0Io5L8WXetw4jEUFhZa7O/tQghmaiE3GoXLT
l9asV8f8Ee5y589rBCaxzNqOZ1cDosOlL7kdUIwQjeldVOc6X/ChHuS8jUVBRCRFSUISEVHkJIaJ
Irkh1WKklkyUiswzopYhYNSbwRKGkRbxi/K5SLn7mtmWSRfZTosIiyRDxmmQ/U2ebTJfRFjttXXp
LKaY7sG9tY2oreaP4uLqzXVpKJcCf45oce7G5+xlDJ2ZPet6Z1kjNDMnslTfKc3sSSEcuz2ndvW7
+pz1FdFvZdj1fuW8YvlKXSURPtp1rKov6I3L2oxsZiTUsPJCRfhEZ1cTDNuiZxLbNJ6cWJbbg1KV
RlcjrpjnWsKL+qtbE6rfuVqsUkacrlSIkmZYSqq1adux0NWvDPbrX9VvPYZ6Svvx97cbDPKOlMEW
jIzW70Z6E/AxLVajnx33Ua7uCZRlXNQlvVK65YNkp7TvNfCjhZfe3t8PCvFhutjTS65GZakuhac5
7M648HMx1KVNlJW7OiSxSm1cizi1Ifc14kbUZUzVGjBVXXpWt1vcyw3jTU1zSibGIlohJZMS3NVT
jhuoXWu3VelTDI5a2iuF9xdvPhpivjBdOpEXLlSxwVzsUThYmiStKstiKWpNPxzexrcmrz2SlOpM
8n8nweXyEE/HxqooqCn30JJoh17N2fVSSqsGzbs3YSsvIGeloPYBaJw3Y+oyt60f3ZPb0EEggDfG
onZ5CHjQUEJOW/9wNMNaH8Ii+T2/LRvT4/Wbhyj1sTp5wej4pThJNKf7JPnBg/M9vZVl+WTw5SaN
k619Pbco1tW379nvREd/w0rqTQj8n2wQjit8UXfYkwaNzn5J9uHxq0RoWNIxKCAlHCPkrGeHLgea
8gPiXpHmpabipzASNnfo9+u5U8NDlk4WrlOXzR9kfM4/g9HLZKSyUp7k6JLgeguDJZdW2nkkupKq
mDrnX7w57RkTDidtGhTjJnLucD+8RJGsnw7L1t/+GDBWsiJOw1IVIqf5WScDa3d/c27IcHdOHPt4
KcaFuR6u18n69ZnyMkPpWSOfnBVKXi7JQiO4XX8kWVWeapchjCcbn0Q1tab+aJOPvWsqjwd/NFht
pZEY12xw4tyxZcOI83yjFs0KNPZ3oR8XQ6o2uTlEVMXidB3MRiqHZXGpCJGBN7uLudYi9uR6CPmh
JfHgSXsfj1ZQ7FyiuH1QjUfV5XalzbJNCJIrbGCSEYrYiSzrJVCxglVK2z5FqItkiSPmcbPHXiRF
9sEvRVXH/kIpEXI+5EcKkYZ/BkaHF2oz5JJIqPQq+l7ljL1WLnMyLENH4LmMRvRpo2zMoD4u9Gcf
XC5CVNHioXvOTEpAa67nYjmhapmhJGK69hRJrb0o1qu0TWx8ZRLvfmk74j6mqIX4DBv7OxsmaQkA
w0g1GgwXfLkSUFJGKQEdI8JaonojRLVdJF8bvXaeL7rkI14eaGToeJxKyWSJYIZoTHmb0bYmjm5j
eeq1HO95JHmYnE4RHoep7i45O3mZxk+hc0P/i7kinChIScAdmQA=


--===============0020612087==--