From: Bjorn Munch
Date: October 13 2010 10:41am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2942)
List-Archive: http://lists.mysql.com/commits/120662
Message-Id: <201010131041.o9DAfuv2026573@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0036045958=="

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

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

 2942 Bjorn Munch	2010-10-13
      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-13 10:41:49 +0000
@@ -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


--===============0036045958==
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/lowcase-51/
# testament_sha1: 72c09c2e092ff931b760bdeaf2f6999d4763c2fc
# timestamp: 2010-10-13 12:41:56 +0200
# source_branch: file:///home/bm136801/my/morelog-51/
# base_revision_id: bjorn.munch@stripped\
#   syscb76m8hr3thsp
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfchzQkAAXJfgEAQUGf//1MG
LAC////wUAOOeeXm7vejue686Eok0aET0aNT9TJk0TNT0J6mRoaDQGSjRowTTJJ5I09BGgANADQZ
JoCE9GlPU8JGmQAAAABiSZU9lTyanpqeow1HqYj1NABoxHqBJQUzImRk0mNQ9NGkNGhoDRoGT0vX
p+GGjPnCZ/cA2h8GhrIciMjn4SKqntzT6bEopiSb29eTFcfqPRDXjM77i7dXP+MfRB79bZbmws63
+BZEaL6doMRwBFkg7Mqs/bbA7wpTxBGlgRI5GnfzVvBR1FmITUI5zNFOS2BtHUuhgpQxMAmWJg0Z
Hk62BKgmNbUERXXmjbTeLGZFEnpeQi9bSiWQr8BOQLqiniIzB+7HrUHd+5rQ76GUsKME7AZGRtO1
CB1KN7Oc6F1yANC4CjQWvmpliwHWzCtchrhDQc8DAWuBOLLGx5qJBuMe0VrNQMZYPHyFkm8oE1zy
g0hlpL0ycgeiBaxC0tCqcTKLBcG231CO2A38wU2+RcoNuEjxDJ50YFg5zRQ5AGBVuFspqqXVZcG5
11x6i4GAqQ2TrQ01DERdjRZGNigVsW5GuSihWFHo0QAfBVdPiOWObugWu97dpImigkt2x1G9cFNR
kgR5ScTYGNrMVRslvNUM46JRca9wiONjQm5cAwrrkvmRmkr1OYpdzjJg5H3PvHvqS01is68SOZqj
vAOGs112pcfuIgLQHUHIgId4EiG5SDGNuIyDGmQ7Vmar2rKDi+Pym4LFz3DJ+SqiErsBVr8zMWXu
v4jJYw1TRVQsqHVrJPynWHfpln8Jc629WJj8jUio8KaaKq6JHdogZHIFQ1G95Ts0qdBKCCs4wbZ2
mqkzG+6Kw6Ca4C8mNxluL0NpswcCewCWnOKKQ7Ao1lDZfezQoxK1DCdhluKcDVaBTztqdAzBnCYM
HUce8RZpKRb7ArFHXKFInBO4HxEMXBtOXxr4x10bhbHCMEy5QnpBrDRie82ZRF0I3xuUEMOxakBD
wGpoIvifZC5Chyv29ILRqvFeYI0K4U7CEgSp/IhHzal2azKGSzTanJ9iqjRqSY6naTfs4IzPQWAm
9pEt0xDjgCa2Tzc5EAkH3Y28R6xGdlwmkNQCdzxsThwTEweSwDWnI8wGGe3AC+mZ7EXToFegBKaY
ZYdJ1xCJTvLYruAkNgKrIAQMksQxY/T0Wf1whs+NEyhmDf6I67SEH5zJAiLAamVqgKaiohjMMZ/i
7kinChIe5DmhIA==


--===============0036045958==--