From: Anitha Gopi
Date: April 13 2011 11:22am
Subject: bzr push into mysql-trunk branch (anitha.gopi:3356 to 3357)
List-Archive: http://lists.mysql.com/commits/135322
Message-Id: <201104131122.p3DBMq0H029325@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0578253601=="

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

 3357 Anitha Gopi	2011-04-13 [merge]
      Merge from 5.5

    modified:
      mysql-test/collections/default.experimental
 3356 Dmitry Lenev	2011-04-13 [merge]
      Merged fix for Bug#11938039 RE-EXECUTION OF FRM-ONLY ALTER
      TABLE WITH RENAME CLAUSE FAILS OR ABORTS SERVER into trunk.

    modified:
      mysql-test/r/alter_table.result
      mysql-test/t/alter_table.test
      sql/sql_table.cc
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental	2011-04-13 07:13:13 +0000
+++ b/mysql-test/collections/default.experimental	2011-04-13 11:21:12 +0000
@@ -25,7 +25,6 @@ rpl.rpl_show_slave_running              
 
 sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 sys_vars.plugin_dir_basic                     # Bug#52223 2010-11-24 alik Test "plugin_dir_basic" does not support RPM build (test) directory structure
-sys_vars.slow_query_log_func @solaris         # Bug#54819 2010-06-26 alik sys_vars.slow_query_log_func fails sporadically on Solaris 10
 sys_vars.wait_timeout_func                    # Bug#41255 2010-04-26 alik wait_timeout_func fails
 
 # BUG #59055 : All ndb tests should be removed from the repository


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: anitha.gopi@stripped
# target_branch: file:///home/anitha/mysql/repo/mysql-trunk/
# testament_sha1: e57763c244bea2b4ff9428eb068b74376cc5b2e3
# timestamp: 2011-04-13 16:52:41 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5/
# base_revision_id: dmitry.lenev@stripped\
#   y1ul3rr7f9ay2npo
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb4PqIAAAwFfgAAQWGP/93KC
VAC////wUAV5vaOt1uwbREANASVMETKZqfqn6JlG1PRMTTJkAGgEqEj1PSZHlPJDIAAADRoASmkJ
oNE9U/SnkptTI9Q0GgPUAaYw0NAAABoAAAAAKlIEwgTAQYqeJknpqaGTQbUzNw+1g0NWdwkq068A
6puwdOvCWLyNtpQIQpU9pcISSbp8w/US4WidFF94OJZJEz4GHLtvy+R08RRT07LgVVKEFF2YjEkx
EPp2hEJBEuifEGMaSjeJTPPA7W1/TZxeKX5gqvpVa5Il6bkL2bGonk7vqYYlwzpiqWwmeAFhANGn
MbQi6WolKHGzOpJm66DQlNCXxrXd9yxlMEfmfN2FtJqorPB1tE0JxM/iv0CZ0ZSUS+R65njgsTGg
cMNnDdVwcTQaUdjKToigXjnkcguROVj73XmWmhqribHbLhyGk8vnAhbeu0Po05Jry3qnNJOSu2Dd
z3Jh24KSY8aLVrBsyVbKV2dm4xJjjnnLDG5YOsKPgGghmqhJhgZBTktULWPjY4rMY19me9bWQsQK
AaSNESIFCIhDhhtyGal/goYiLTL7jDEIBXPtvoRqM5IHKYrntY7PBlew3NDkjbXr7u/nqsvwxKb9
ZRUtcRCURhfCSVHVaTFkCUmWxqVVLkZE+mBBpYmKZUF2zVL6XuWIFjRjqhE9DZ8jAukXRikLxB7W
CSe/iYQfUjKRvnrWpAaGQuF3DsQcEETGb0kZhGkbzlUmT30J8CiKhkhp3GBn5rE+OsDDuYmszSmZ
uiwVvltkXxiZFR5oaGQrEWZyRoK4qOF07iIyHFIL2ac5jmB4B3lDv2SoiAh+Z9D3nh5yeiHgz4vx
UqSj72V6lVJpalkPf3rKOFEHDO5osGMG6LYf2HDaIU5phumNFZBLNWlniMHD+w71N8UVKVfZ660c
4zp1PXXx3PLfW3s1fDTmucu5Y5i+6ZNtuGOll5VrPLvx8Eb/jXZs8HO6iiJ07H0RNjbMN/N8pstp
2mUztmvVHLJKnouSyvW6qMOhFLgUHHOI3kt7ASxPO182ky2ZIPpmrzcgkVUlxeYm0Yaw8BkihLE0
asRlRAsoaPxHQJW9LS/j3i1E50D6mFc3sTBzxil4hck0TBawy9d5v57oINpSf9RukyHCfX2TOliX
N3Cnn6OqOnk8CrP3JvWmDYfV4szbSaFFFXv2e0p5Q3oZtU3kdozY5HatbFKkMmh835Si10PSb07L
5LTW9JNHl/nB2LG0Xr/MdhHWFrH1nR90eiO5zlMOUn8N8nw8B1NI0qzmoZMkShY6yVYb3mxFyok7
4tXSclDpJwXM9y42JvKl65dROTMskpWskrdX5WoadiX4mDCDCiUSh1xzGrbmUVKEmYclFFc+H1Q+
ETrJlGNSfbdnw37OD/UVsN3FRRKzmekmKRcwTIq52rL1bt5HujUYwPZajM6NRimE8aSXxu2I8Dju
Eyc0CZkctSFjnccO5AqF4CJnYmVMfJfF8L0225Z3ilipyKSWKmLcXNJGZfxZHVjJlJnvkurSppTV
/fyOLQl+j8Jn6JtN0ltmlKxYYtyWp5TpLkbFEvMTJM8S00FyVItZ0s90bZsRmfRXP/F3JFOFCQvg
+ogA


--===============0578253601==--