From: Bjorn Munch
Date: October 3 2010 5:39pm
Subject: bzr commit into mysql-5.1-bugteam branch (bjorn.munch:3517)
List-Archive: http://lists.mysql.com/commits/119785
Message-Id: <201010031739.o93HdZrD002085@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1728607855=="

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

#At file:///home/bm136801/my/mysql-5.1-bugteam/ based on revid:bjorn.munch@stripped

 3517 Bjorn Munch	2010-10-03
      Small test fix after 56753

    modified:
      mysql-test/suite/innodb_plugin/t/innodb_bug53756.test
=== modified file 'mysql-test/suite/innodb_plugin/t/innodb_bug53756.test'
--- a/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test	2010-09-07 05:41:37 +0000
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug53756.test	2010-10-03 17:39:28 +0000
@@ -34,8 +34,8 @@ INSERT INTO bug_53756 VALUES(1, 11), (2,
 --echo
 --echo # Select a less restrictive isolation level.
 # Don't use user variables. They won't survive server crash.
---let $global_isolation= `SELECT @@global.tx_isolation`;
---let $session_isolation= `SELECT @@session.tx_isolation`;
+--let $global_isolation= `SELECT @@global.tx_isolation`
+--let $session_isolation= `SELECT @@session.tx_isolation`
 SET GLOBAL TRANSACTION ISOLATION LEVEL READ COMMITTED;
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 COMMIT;


--===============1728607855==
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/mysql-5.1-bugteam/
# testament_sha1: a763239e28213095ab0afeb309659b78699b6fc9
# timestamp: 2010-10-03 19:39:35 +0200
# source_branch: file:///home/bm136801/my/mtr-51/
# base_revision_id: bjorn.munch@stripped\
#   x38yu2y1hg1iq8gm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd6+mTQAAYRfgAAQVGP/91oG
DAD////wUAN6220TCnmjgklBlNNNTyI0ZoyZCbKYp5qTymnlAkoQmaZTTaaEpvISepkGRiYmJ6CR
QE0mJppJsmhqND1PRBiDIBhoaAAADQAAAAAkkmSZko09J5NRpp6noh6R6jIAGmPSe7yyWWmc5Ecd
LwJVhMrCf6KY8rmN+f1KSpvlCN7ibtD+uBJsPHPJh56ZcjL9sUD2nbDIoGRrWb3KTJhjOwiPYWzp
5meERdv3auDJ70h4jimbbJubTt511Ccx7ULtaBoTgQJCMVSeKxmpRakrShvlnU1EWrSIj5amQSLr
cxptaDPG70KHks+X7XJZu8ztSB+2TbEUfBDftyxvORouHopyzNdUK80cn5QlYOE2bAk60ee9xQgq
E0HE7CeGYaozWSkTwOSvmKloZxmay/BrJlPBrRjaBvKDx1QMwGnSkxxV5kuL4ajlK02FSxZIYsYF
muhBpnQLCzc6K1jj17tBb3lY++c1fuL5GyhX/SVpggoZm3YosVcaoqNQ80rKqBWp9H/FRhcW14VL
fxfAUVtzDg4pWsdr6d+BMtga4XmwcAt7JdDljlEdWnVzLgrc+HM2HLS+OuLOzy52Pv3fERC7Bpnb
QxD3PwhJMB38LFlk9aofoiDzQ4jJSEPnXXi49LkjZujxzRhQX6p30O58ZkPXsF1u9cKfgLsrl1OF
49cC4aD8bwut4VV0FRAdZ6gVdLMkYJE2zzNLI/FIo0z4yJZwdonNHQirHvqQpK2OkMOPfBNNuaBz
wmudhRY18re2k9XB3esDmfhNV26Q6t27KJIIPoLggtJcdz2fMjyhIc/AhM9JOb6+JSxbZZBmW5Oj
Rl+/7tTrTTzIEjWGTTnBwt/cUwvVVahtO7Ee1/0mdvKlAX6/QJpeXJvFnvPcpDJjVcvENATY15t2
2XDER2DxRCf677QiD3BNiG6lIaltZAsr2lUopHzgoFDNokWZnPeegiDuud1WIZrE0uOV7EUCTjnA
O4NqINNb/eaEwq1XBcCoEb4Dski8JLtSN8yrusuZk4mha+f1JLOZcRWmnoZVAGyZEsOYwkKjZSJZ
3VveD4ew+Ong4vjz0MmdSsnhYTiiBQDTucV0he5vcmbujrsn2Lm0Y+fLaOCARVzKWJ0HkNy8RS6g
311dOsQ7QUFmF3aK5qeZFKvHs4qVp/aSS2TgN+RdyRThQkN6+mTQ


--===============1728607855==--