From: Bjorn Munch
Date: September 30 2010 8:28am
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2937)
List-Archive: http://lists.mysql.com/commits/119485
Message-Id: <201009300828.o8U8STdU027615@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1506173074=="

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

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

 2937 Bjorn Munch	2010-09-30
      Small test fix after 56753

    modified:
      mysql-test/suite/innodb/t/innodb_bug53756.test
=== modified file 'mysql-test/suite/innodb/t/innodb_bug53756.test'
--- a/mysql-test/suite/innodb/t/innodb_bug53756.test	2010-07-06 02:26:38 +0000
+++ b/mysql-test/suite/innodb/t/innodb_bug53756.test	2010-09-30 08:28:22 +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;


--===============1506173074==
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-51/
# testament_sha1: 5bad4c077fbc3a79d09dcc625ec8411cc8d6581b
# timestamp: 2010-09-30 10:28:29 +0200
# source_branch: file:///home/bm136801/my/mysql-5.1/
# base_revision_id: bjorn.munch@stripped\
#   e7w42ulr0elw680x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaiT15AAAYhfgAAQVGP/91oG
DAD////wUAN6uhyd6C848EkiTU8mTJqbSeJqekemggwRoNNBlI1PSeET1NqMmmgAAAAASSATSYk9
MKn6U9NTRp5I0GQ0AEkU0ap5CYmAA0BGEaMEwEoqaeo9T0mm1AGmjQ0DRoAALtDu8r+g0d8XnC7K
oEJOiOdl6Eb+ubDN5/MlCW0HPwaBuj+G4j8zrvl5/1dErL5Y1URT5YuUycyNKzVFY6NdBHHf0Ny0
l3m1RVzm/VIoItTaSwe6PZAWQNUcsxUOgZCZ2rj1MjUivVyKljPBBlwuIioqcke4mJrK68oyfxsV
gLq65ZmPOo58p8mzbzXiOGv9KXHwyxyK+3GeOud2R6i0XZF7AoU1FEeziXHJpEBYOLlveFq1v7dw
vxeq1FOcLN6lcv4KJfG+NFgQKPOlL2MdrggVc+f9VIKJAYT/yXx57a60I2A3YSMC0Ym6HsXQa3Jk
EZpSYG7inmEBEFsCHUU3C2fQ1JSHY30xpDHzVWomVFT03HHJZvrkolUMMYkY2Q30BzjAS0xVlRBq
1J1Thd5gLf3Q2ITrfB0yMDvtKEGWzkGlnKhf+6WUUBwbsn5NDHN6m5NNolAnRtupmddav0ex28fK
M56tgh0UrJj5wYf0PseR8iH6PNUR5rn+5AHXLCMISAMMhsG6CVT9y4Igx0UAPN8sb2UZ53xINS+F
GspowXI2HeetRcthtGd+N1W0M8sshvkJ3v7WgvGtmSHnFImpFNpt3x0SKFYOgVCsxzQlxDD8FyFt
4UjqcS2X5LNbOx4wp3WvL2CrjZlZ8VemXM1n44iW46JlPmjzu0221vIAdURg9PvJ88+0yjExoMhr
v9SpjDBrr1igRILDn+6jQyRoCScWAp1YZ9BPr3JsVQwqkx2q8BDTSv3JcZdRwqKawjCe0zS3jqEJ
JlmHBXTNjBwSOfQxDgGWdIYxEIDWtGkpE6qUKIji3PQqLlYvTPCC4iJYTTMIYYZKmr7MIlCDSWHW
lVkOyZcYCwJyVcwyEqCPG2J4JHMNy96R1et1wsccmZOIWz4Rx4Ea1T1hYkuckU43E+UxLoWvvjEI
aPs4eDt7WaTZM6i8IBYBJDGEzqxxe3kPbauPJMa0nr4AzBIDQHGtCkF7RbK6jaiP5YIZKCwwA4l5
l6QHEqNsNR6ngsK2fxdyRThQkKiT15A=


--===============1506173074==--