From: Mattias Jonsson
Date: November 16 2010 1:01am
Subject: bzr commit into mysql-5.5-bugteam branch (mattias.jonsson:3128)
List-Archive: http://lists.mysql.com/commits/123964
Message-Id: <201011160102.oAFJXE2r017880@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7643811352524920332=="

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

#At file:///Users/mattiasj/mysql-bzr/topush-5.5-bugteam/ based on revid:mattias.jonsson@stripped

 3128 Mattias Jonsson	2010-11-16
      disabled main.create-big as pre-push fix

    modified:
      mysql-test/t/disabled.def
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2010-11-16 00:11:06 +0000
+++ b/mysql-test/t/disabled.def	2010-11-16 01:01:49 +0000
@@ -19,3 +19,4 @@ log_tables-big           : Bug#48646 201
 read_many_rows_innodb    : Bug#37635 2010-11-15 mattiasj report already exists
 sum_distinct-big         : Bug#56927 2010-11-15 mattiasj was not tested
 alter_table-big          : Bug#37248 2010-11-15 mattiasj was not tested
+create-big               : Bug#37248 2010-11-15 mattiasj was not tested


--===============7643811352524920332==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mattias.jonsson@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped\
#   nqc1jraobxpnmp6o
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-5.5-bugteam/
# testament_sha1: bdbc6debaac0fd59b37959ba139ee781d92a7453
# timestamp: 2010-11-16 02:02:03 +0100
# source_branch: file:///Users/mattiasj/mysql-bzr/topush-51-bugteam/
# base_revision_id: mattias.jonsson@stripped\
#   j5rb3amc8rg213o2
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTc+/TgAAW7fgAAYWGP/91IS
AAC////wUAN6j227e72mO5vdhKJJhNMTABoU8k0yYTQ0Mg0VNtUzTNKMnqBkA0AAABJIaTQCj1M0
h6EIeUM0NEYCRSNT1T2qekP1TT09U0YgPUPSAA0EklM0NTCYRhAAgaAAeHV1nI4NrzyKYaoKLA9c
IxIbLwsfD862ZuX8XtKd0CCjuH3D78+vi00lg7sYptU7UxdrZm0cEYqD1tbz0B9CFNRlI6NjUNA1
06RV5zjZJIrqWtIxjR8pBQbE4ELwgMyQwrgkgOJlgSIu4dxOKz6CYTT1QpYrGV8uuaRowohzLd3B
xKkxDzpSfOdVoc1yJi+IT2EICNlx5WnLm8pnuY6CqKTUwhuQYGWJrnHDkjgWFV9/kxDbYR3SajG5
yevm+GVDa6QjL2I89kWYuNVsykJhpNQrDQjl26h5HZDRQi0t4bbOmV5xC6ozNEEAgwtMsg4/DFSG
rrr44XFtqoiK7xWYFsZC9giLb3kgdO0HJI2aINgW6gRKZnhzCDXmwNUA1oK1jPCwe++47qzGhf5N
c4zY4QnczwRSJKCabOSDNJmRWtLnjzLu9crUiNzG38TseiPDajLdYmGyhiZPsM3hmDd0SHZ2cFff
wCp9T0qZkSftjgUCUb8UE0ip/ogwxMDLPUb9BvEqCJnQTNJBIyGGYNni/TQ4oNI3JHHnhZVYtdhH
b1mBO9RTgpFpNT2l+NRwgs46GDARpFX0Ycpd97G7FZDAHB2IXW6GKN86SbmSeiNopmfU7qSnVFSC
qfO66TUqvgqM1pOZ8r6FKYT93eJexxHRjddAe/RGRhzfecBgz3neVJxfQ5CamH8mi2GBqXMiNNtw
UVkD8vsjgWhSGkOpt0R9WnDwSN4sOBWccAljBgmcG56QxiF9uRtlPJpDZdvSN29aB6niNDe+Io2G
lcsROcdKpjMJUqiEWUszULNaWiiCqixprX4omExUsiagV8E0h9O/6SJFd6QwvVILRydGGddpAWGl
tQJErjzE9Zs4JcZKJhT7cMk9Jb9IvUKsiRFHCo7Bn5TrQ6EUQTCJL+UCFEqxBiL5QDnocWHiHAFZ
YfyGMAjKBB1KpulDaWkSGkcdvYm6iq10LvvItQLVtZ2VKIWrnv769xSTJrg7VzzCiVC3bip5M//F
3JFOFCQNz79OAA==


--===============7643811352524920332==--