From: Dmitry Shulga
Date: December 30 2010 8:36am
Subject: bzr push into mysql-trunk branch (Dmitry.Shulga:3448 to 3449)
List-Archive: http://lists.mysql.com/commits/127703
Message-Id: <201012300838.oBU8DYKE008632@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1785141691944729326=="

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

 3449 Dmitry Shulga	2010-12-30 [merge]
      Auto-merge from mysql-5.5

    modified:
      mysql-test/collections/default.experimental
 3448 Alexander Nozdrin	2010-12-29 [merge]
      Empty merge from mysql-5.5.

=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2010-12-27 10:24:47 +0000
+++ b/mysql-test/collections/default.experimental	2010-12-30 08:30:38 +0000
@@ -14,7 +14,6 @@ main.gis-rtree @freebsd                 
 main.information_schema                  # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically
 main.lock_multi_bug38499                 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
 main.lock_multi_bug38691 @solaris        # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10
-main.log_tables                          # Bug#47924 2009-10-08 alik main.log_tables times out sporadically 
 main.lowercase_table2 @darwin            # Bug#55509 2010-07-26 alik main.lowercase_table2 fails on Mac OSX (again)
 main.mysqlslap @windows                  # Bug#54024 2010-08-10 alik mysqlslap fails sporadically starting from Dahlia
 main.outfile_loaddata @solaris           # Bug#46895 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   yoctppwyungiq3gf
# target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/
# testament_sha1: 1ac988281e43e18d7e5f6b43d3787092be516227
# timestamp: 2010-12-30 14:36:46 +0600
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/
# base_revision_id: alexander.nozdrin@stripped\
#   5rhksndrwz5dwcd7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRFZ4NUAAuhfgAAQUGP/93YA
DAC////wUAWZ5Q6KzTcgA6oASkSGnqaPUPQmmm0gNNGmgAAkppU8yp+jTQp+qDTTygAAANBKaQQT
EnpkammgDRiNABoY0NDQAZDQAAAAASSCABNMBCabU00QDQTJZpBcbC82mchJBodYW1tClxjGUdER
4SgUyVx3wg44g47w+YRJCpRUq4RhF3ugtp/G764HrEeNvvefphExhlafAxcaX/Y9UOe5I6Yzh+So
pC0BT93lS7h16GBsn/BzEbE8xcKhqSSQpNgFNULnDYb4oANJflONbu+qyhmNZcz3gGI0ZCcBkwJt
hOcVRFCBbs4KSWOABbODheRYiysTlQiNF7yUriPWI+/uPvCRhPDoe30iAnXWC1DzrNyGBiKJvKUA
LSkc4zkyKy8LBW4Cnd2KjAmEQ1HqcQ3tXrhLdKV8pbRmTzYqz5Q/JMVE65CSmeT3yN0ComSRdCJE
cKx+Bbjw5wk4Vhm4Ck5myeOxdQHHdRDgVgGIq7yh+HCHPURdPwpqVkSBAVMQ4f2E0qpYlc8/YvUR
wugReyKqlkMoi0dAqOhscdYUU/8EmBGqXWWYKppQiPDEJywdDSdI4GCsnfqZp63g4sBuA1MHMWl7
QM9yjqUWlJVuoyQzK4T+HE6CkWVV2RCpiUVBeimQkKRsDIm3EZHNkhyhXcgwu1UDDtvYtVKCne2g
mNNExtjW0W14iTNeQYkMYiGlS82qmU0ZYyKrSGbmL1EsCythUjAXZJiakT0tfIgZKZ2uNcSeyBiO
Mqpz8qjmtME0jAT5xkisUyocJzmRGQ4pBSzUTEYHmHAwKshxGxJQyPY7CQ2kYN3LZZmSQhN/Hn5I
Wm5C4gUjJe3aAfZOhh6PFqxDmX59CcQL4VUK1Nw03C2wBGtHECI9iJKI/MQF0tEdedjkaIRT8Vob
xJknELJmSqWqhZVUR1lcL4RgvERkkT8mAsIFMh6ATlYxwjkQ4eRaRtLSGKjY/vKcDmdHsMAvB6CF
xMi8TGHmaWcMSodWh+KmFwMIkoqe1mE8xxheeBigWHUIEBooYcM7M9BSqwysXsbsIWZl9esXuT/l
fH6BidoFOhRcdx5uHsOuKktj3niRLbOjHf0txOxjk4hPOLUjfWU0OMqPgeHgMkvqJwuwVpa6kniK
DLyIH9YnAgLMXznFE6I4+p2MpOgdfXvkKBoeZMFXjAPqe5eebKoZh12II8Z4IPApBaXG6bPmBVOv
6PAGLQisz8eUpUWn+ExKdg1FIk8MeLxeEq/5oXjy8Cc5C7gXbiRE26HZcxGyfdNklkvmvsYi2Tcg
LALBwchg8ywBMEDeUX3BDZm483YUg9Aui+TjrhiiRelXQYNwdQBzEiBaHKFzEbCgzG32EMPExITD
0mFooD3yirHOOIomaAkYTCYPSTp6BEpCJ/Yq3HJtHuBKYHmOHD11/wCmlRHVwqOQtjY+4jTYYYTw
3D9pTKhOOVItZjxILiJtVzk5i+jBUkl3M4iKTuXhL8JvdkshS0I4aSXKUjHipk4eDCBiYjoeoiPE
gWnZmYqMADEBxKFTDeF67qhE6XkNbXabieOOYVuSiPKzMJTldOYbFQbmdSVYnibKcESvE49svcEc
isVBkKfg+C/2ARWirFoB6iIhPWvwUCPIVC6zoXEYVIdwiIUBOXyQTaiyUx1P0I/8XckU4UJARWeD
VA==


--===============1785141691944729326==--