From: Jon Olav Hauglid
Date: September 8 2010 7:38am
Subject: bzr commit into mysql-5.5-runtime branch (jon.hauglid:3133) Bug#56595
List-Archive: http://lists.mysql.com/commits/117766
X-Bug: 56595
Message-Id: <201009080740.o886jgig008710@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2618797090587191126=="

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

#At file:///export/home/x/mysql-5.5-runtime-bug56595/ based on revid:jon.hauglid@stripped

 3133 Jon Olav Hauglid	2010-09-08
      Bug #56595 RENAME TABLE causes assert on OS X
      
      The problem was that RENAME TABLE caused an assert if the system variable
      lower_case_table_names was 2 (default on Mac OS X) and the old table name
      was given in upper case. This was also seen in the lowercase_table2.test.
      
      The assert checks that an exclusive metadata lock is held by the connection
      trying to do RENAME TABLE - specificially during updates of triggers.
      The assert was triggered since the check is case sensitive and the lock
      was held on the lower case table name.
      
      This patch fixes the problem by making sure the lower case version of the
      table name is used for Table_triggers_list::change_table_name() and thus
      also the metadata lock check, similar to what is already done for
      ALTER TABLE ... RENAME.
      
      No test case added since this problem is already covered by 
      lowercase_table2.test

    modified:
      sql/sql_rename.cc
=== modified file 'sql/sql_rename.cc'
--- a/sql/sql_rename.cc	2010-08-10 11:16:44 +0000
+++ b/sql/sql_rename.cc	2010-09-08 07:38:02 +0000
@@ -284,7 +284,7 @@ do_rename(THD *thd, TABLE_LIST *ren_tabl
                                      new_db, new_alias, 0)))
         {
           if ((rc= Table_triggers_list::change_table_name(thd, ren_table->db,
-                                                          old_alias,
+                                                          ren_table->table_name,
                                                           new_db,
                                                           new_alias)))
           {


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-5.5-runtime-bug56595/
# testament_sha1: 589b251634177d696358394ddff7e72c1df4782b
# timestamp: 2010-09-08 09:38:06 +0200
# source_branch: file:///export/home/x/mysql-5.5-bugfixing/
# base_revision_id: jon.hauglid@stripped\
#   zesazp04nton9ozx
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdN3MpkAAcVfgEAQWGf/93JX
nEC////wUAUdcnvGS9F61Xbx3b1lCSSNTExMTCGmghlNPRppMymgZpASSQwjIZRE2pptNRmoHqBk
ANADQTEKaT9RBoYgDRoABpppoASJTTSYQo/TJNNPUyIPU0MgD0CMmgkiEAypqP1Mg2oAQ/VBgACY
LSw4PTy3Pj295ThqVGF70FrPBgeMtm2UUR98NseD7v9OZ7R095p6aWZib8qqGLK5ds0MBB7dZDG2
GOzNR6sXwczPUp6LkB3MjazeVCqHxsmOxiq6jrDVKcoF5XEDSDKZkN+KLApfdmM0FyczjPwSU2cQ
NUrnuU4V3ZZ3mZYoKInDp5Lt2fXhP3chzC2zsbu/whvfKUiPcebxWV7ijXZffeb1tkm09zmy6KZn
iVKRAPdPDoiHqlhmnaAIyA4wimzFIgXyNsX+WSxICzURSEV4Jk6bVMWK4THiMfdfuKdb++d+Eb4u
H0x2y2GHFSHFtk4WI9HPnm8npDGuLiBHk45tBX1OJFhFxSCaG04U2Fr/zCCY2MGPhSpuMMqrx3Gs
XRIMKTufI1qK2EMXEldCOeEhWe2V71MxIi0ks+Mqyq6rFevIq6wOMAlg9fGysYMxkjLIa7HsOLpS
CKZQFZERRmnCUmPmRa+LyUV4yksjPNSrqwoJawPNLT4kibKA8cVnOjh1urNBpt1m1fEMn1mUvoOO
KYWj4ejLW5m7bq5NAVHJ7k0GhJAxRN6l0tsmShQfTpx7XpHUJfgI05mP0HK73PhMOfcFd8+cK0UV
hZChh5DC1yBrs1Y50fhreo5wj3ocQBs0FP++uJBXbzyJEJRMuzs21RBqmI1ZWIlgMTKvztoR58Re
AEQTxptpEzusKR4xGPmdlazceGjgcxXDrUjzW3hctIPqWrIcsSMD+uOizbDp7Hp6VTmFXulao04F
8Q6HQkemlIqqKZs3MbHWvlca+f5m7lrMnI8QcSBFgGY82lFFhgD7aMMPP0Yc6gSsykJSJFS369zi
ZSyGoBbGPq1HHsnRlfDzTBqshxdcezxqtesscTVOzOML9/fdg6jHl8JZ54ZmOrFBWXNBfEErDk11
C4mRr0ZWyWbbYyICp045ZlviSazhuoVUt83gYXmyzBrNbmxA9SEdTvnZSbdTg3dw2g4PTZEOgUpK
s0wWevQsQes5uCRH2Ggb00qwlJ7BRemsdpU1LcOHJOSHRn5SUlvxT1aCY7QzblH09W18ookHEZt4
aBZX0RO1Uufu8pw/BxGdTalGKsnzh21CxTcjALQ3TRAIrj7IHB+YsFyQ7jMlqBUpr5XyRAbdIBHh
Ni9phNIs0qwKMLaeIxq116RTMrbS6j13MpGA5AYQPgfYZ0zxJAwS4mcIWQx2AL7lPgoVbTXq2YX9
riyxYJ3lgniCtg9Ih+KQ60y7KEjM/yRAHL1uW1+aO9PJLWq7jXpZk3PgYUnw5i55VWrNaVqKsy4t
WRBOaBiKS4XMIjkujgViMOKgWGxFWwvkfTYmdIAD8hk06ZQbohmiBLKioeQPjEJAVlDRIIdeESlS
uvDRZLMU1v1C0mebXz/kHLWBlFsNUQLPTVHZOK3l7u4cP6GsHe0yOJCN1rvfJmHskum/dnnodlvI
SMFQGTjV1pOUN3R8t+gLsaZbgTLMqotj+3tIzVFjDbDmFxwMRjrqQ9X4Vrq82amlrhiA07Qkda7M
i9UW8/4u5IpwoSGm7mUy


--===============2618797090587191126==--