From: Bjorn Munch
Date: October 19 2010 11:54am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2940)
List-Archive: http://lists.mysql.com/commits/121122
Message-Id: <201010191154.o9JBseLx027697@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0084372690=="

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

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

 2940 Bjorn Munch	2010-10-19
      Test wait_timeout: do not fail by SQL syntax error, use die

    modified:
      mysql-test/t/wait_timeout.test
=== modified file 'mysql-test/t/wait_timeout.test'
--- a/mysql-test/t/wait_timeout.test	2009-03-06 14:56:17 +0000
+++ b/mysql-test/t/wait_timeout.test	2010-10-19 11:54:28 +0000
@@ -53,7 +53,7 @@ while (!`select @aborted_clients`)
   dec $retries;
   if (!$retries)
   {
-    Failed to detect that client has been aborted;
+    die Failed to detect that client has been aborted;
   }
 }
 --enable_query_log
@@ -108,7 +108,7 @@ while (!`select @aborted_clients`)
   dec $retries;
   if (!$retries)
   {
-    Failed to detect that client has been aborted;
+    die Failed to detect that client has been aborted;
   }
 }
 --enable_query_log


--===============0084372690==
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/morelog-51/
# testament_sha1: d3d1563466c92a69656cd13cf785256d757d3507
# timestamp: 2010-10-19 13:54:40 +0200
# base_revision_id: bjorn.munch@stripped\
#   i7m31uqahrrvfvf9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWZWlks8AAX7fgEAQUGf//1MG
LAC////wUAOtd7rpmZVBvb2EoU0aUxtUyek/Qo9DTQBGhoNABKKmg0yNlPUyAaaDQADQABkQ0CFP
KD1PSAxABkGg0aBtSkyNNHogaAANAAAABJIQAnqYEnkAmmppkPUA0ZNGKa4i8+BxrppQhGhAdGRZ
KnM6AjD8e+pRVOfIOj2RBUKiKq69YjuQfY2TGIbTue74m4bMJbVOpBAQGlqrW2057eCMqFuiE50E
MHUSSpW0LOGWgeJOs8RDuYFERvQwQvhfGYmMhKmnDCTIpjDDI9QRvqzPVBMoZJwMelcFCsJ2HDZ0
EgKw4OQb+Js50lJKMAXCDaBNr4byS+j6CW2kqgxDKHMNVTnQF8BSmF7OLj1FPiqF2WbILisicZXK
5woaFdrwtR4i2xs1IuEnwWYDca9IkpXkyPRUjDRI43vEi4XNOLS+yZa3zgzWkJMiSTAs4xIabJhc
Vaz6J5DSBW4s2yRkyMi8iDhhpTW+lxUqcjFx0sqfsuvVmx1cYnuSv5NNXCiZnZRpngkBaDW1kdCj
VXPSTLYBEHRAXUGEFjUcdmIxThjdccMnAWK65HjJnBFKMjxEBopUZeIrv052MlvpfvRB3UqKe3bJ
iOi/KuxQmQ8MEiIoQMpfLeVVtiLy7cIPoVg4pm6H8G2ml+nChlJu5hUm166LolencRNq5HMZ3p5l
N5BibojhYcGOpacvnxNwLQrZhFZ3C8kiPMkZeNtPhdEK7FNMnQknJVrJ/eqJ6Dcxpu3eMY/EE0Fd
zW8mzHLIZ9nbwzq1GEMcpBwxbNkwwV3EhbRt1U3Nd+3HkxqHG5MsAyyv2Z6UTe0oOnKAzIKFQRF1
lx11EpKkMo0DZfLUWMah6ZzQXc1NSHiTcXiLcFJsORXYPpV4tYPMalpo908P8m3LvJ3FWaYeKOIW
eudr5y8MQpDg+zt1EYdx0wC4U/CUHBQ4HzCGDzcVx+UvafjVycI8E29ZVagcxhI+DHLWI3zT6ieL
xDrRMboVMImCDZFEtAfplIyZaXHB5Zh0KogpA0lXsIoDGpe6RQeUi6X7bQ+tPBfDLczKAlXM/Mpt
n0csrSgJvRxE+m0NnYE0W3GHaWCo4oaJWbIzwP2mDliwAu2EmWihc0KJOJAEy3baR4zKRg1968Wm
fiS4Az+IoRMzDquusZh9WuWIWlgoTDgcVWoMSUaV9GxFyaL9iQnpiOQTjQKEaQdKk7BjUUo54SqT
iotdGNcRD96QZA8J/F3JFOFCQlaWSzw=


--===============0084372690==--