From: Anitha Gopi
Date: April 13 2011 11:22am
Subject: bzr push into mysql-5.5 branch (anitha.gopi:3439 to 3440) Bug#11762246
List-Archive: http://lists.mysql.com/commits/135321
X-Bug: 11762246
Message-Id: <201104131122.p3DBMHm8031791@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0617765100=="

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

 3440 Anitha Gopi	2011-04-13
      Bug#11762246 : Test is not failing in PB2. Remove from experimental group

    modified:
      mysql-test/collections/default.experimental
 3439 Dmitry Lenev	2011-04-13
      Bug#11938039 "RE-EXECUTION OF FRM-ONLY ALTER TABLE WITH RENAME 
      CLAUSE FAILS OR ABORTS SERVER".
       
      Attempt to re-execute prepared ALTER TABLE statement which 
      involves .FRM-only changes and also have RENAME clause led
      to unwarranted 'Table doesn't exist' error in production
      builds and assertion failure for debug builds.
       
      This problem stemmed from the fact that for such ALTER TABLE
      mysql_alter_table() code changed table list element for table 
      to be altered when it tried to re-open table under new name. 
      Since this change was not reverted back before next 
      re-execution, it made this statement re-execution unsafe.
       
      This fix addresses this problem by avoiding changing table list
      element from the main table list in such a situation. Instead 
      temporary TABLE_LIST object is used.
     @ mysql-test/r/alter_table.result
        Added test case for bug#11938039 "RE-EXECUTION OF FRM-ONLY
        ALTER TABLE WITH RENAME CLAUSE FAILS OR ABORTS SERVER".
     @ mysql-test/t/alter_table.test
        Added test case for bug#11938039 "RE-EXECUTION OF FRM-ONLY
        ALTER TABLE WITH RENAME CLAUSE FAILS OR ABORTS SERVER".
     @ sql/sql_table.cc
        Changed mysql_alter_table() not to modify table list element
        for the table being altered while re-opening table after
        .FRM-only changes. Doing this made .FRM-only ALTER TABLE 
        which also had RENAME clause unsafe for re-execution.

    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-12 11:17:25 +0000
+++ b/mysql-test/collections/default.experimental	2011-04-13 11:12:13 +0000
@@ -18,7 +18,6 @@ rpl.rpl_innodb_bug28430                 
 
 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


--===============0617765100==
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-5.5/
# testament_sha1: 4f42e1a37ebae12af8af98a07b38494a6ef2eaf7
# timestamp: 2011-04-13 16:52:07 +0530
# source_branch: file:///home/anitha/mysql/repo/mysql-5.5/
# base_revision_id: dmitry.lenev@stripped\
#   660exik6gd1izx0x
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeR3GnQAAXlfgAAQWGP/93KA
VAC////wUANa8Dnd1UBoNCSek0yZNNNGjyRpp6mjTQAAGlGT1TaTZTxJ6Q9RoAAAAA00pp6Jknko
yfqRk0A0GQyYmIMAAAAANBoA0A0AkkjCGgTRpqabTU0m0CEGI2TFUffSJ41VJYQGBQbIwsyY1W6f
pcSRs1je5iCSUe6xeZnWDh0+p25dFy+fKENk185m47AhgoatDA2OEZAQOEmmm78Y5vS6RdTxSIrJ
KKqwZz8q3pmWBvZOoW5hFNnmradXpDMfimwZR2mYq1SXfQ6tSF8L0wHsXNQc9niLFoT6ytETFZJL
zjKqkUdMMsysV0lqJhWyX2KZ7yxlO0+njlQVx7vy/Jfqy7M0QtzppaYKPCTBdTbVPCsOPILxY95K
BWwuLMyS5tZTdCcX3YOL77yqpQRYqFYkYUZt+yRYPhGocRng6Y4me2kZGQsbOMYUhrBECh8BK4jY
8SDEK2y3WKWpJCcplRIynFbyuAyqW5ZNRsK3gCZC+hxuM4VBCUiDFrJTJrzEJohSDHdQVk++Zoga
nVV7ZDhIzjFQ+yl6LbEteoa2xC82i+A+++kFodO6WI1HVy3W1k4ioig8GSDu8qQCORRC65QbNkmY
O758+qQ8lnVSHhWGM3Uv4GY2H++tyNFNeN+PSYsEyBrhh0AaoBK9XtjFaCtjQX7DibTQZkQ0yWkQ
wxJZa+S3vbuLCeN96rTUprujR1L16x99RevowLY++7Ej9wnZszVCxIlgU8GB6VbGKXJQkzibPgeM
djHuiMrROFCctSzjn26vRrV+2xVYbl9eysUMvHw5i5bFXFbig7GJ9ekdzE2Z3pl7LZG9KN5vA0CF
dho/czkrC3y+Ez+Z4rgsZA8wP7C3w/7PGnIJS6hiB0B9fZa/kX0Fy1TaB9+AfPMJhNxzYqqSGKei
dLf4+AQcC70+AaMdFwhOEDeNEe9lpCkGopVBt8PShCCCDJkxtGeMGcwKAcWag+fsl8pGwVri5f1t
Orfxz/8VFWWbMqDU7BWgga0Vxo00XuKSS9qUQ6WkTqwRW/g6eVmRkOatlPBsSaJQALxlMfKCQCdD
pX+KOWoIDlu3ELQIy5Vm1YWBFPcnXfrhWq5XF6ooqVAUnl1XJUpcGUDUvFSJ1nuLAwFL2oX8F3JF
OFCQ5HcadA==


--===============0617765100==--