From: Dmitry Shulga
Date: October 27 2010 3:20am
Subject: bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3547) Bug#56619
List-Archive: http://lists.mysql.com/commits/121994
X-Bug: 56619
Message-Id: <201010270321.o9R1Smif002627@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0258039209=="

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

#At file:///Users/shulga/projects/mysql/5.1-bugteam-bug56619/ based on revid:bjorn.munch@stripped

 3547 Dmitry Shulga	2010-10-27
      Fixed bug#56619 - Assertion failed during
      ALTER TABLE RENAME, DISABLE KEYS.
     @ sql/sql_table.cc
        mysql_alter_table() modified: moved acquisition of LOCK_open
        after call to ha_autocommit_or_rollback.

    modified:
      sql/sql_table.cc
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2010-10-19 10:27:09 +0000
+++ b/sql/sql_table.cc	2010-10-27 03:20:29 +0000
@@ -6832,7 +6832,6 @@ view_err:
 			  table->alias);
     }
 
-    VOID(pthread_mutex_lock(&LOCK_open));
     /*
       Unlike to the above case close_cached_table() below will remove ALL
       instances of TABLE from table cache (it will also remove table lock
@@ -6853,6 +6852,7 @@ view_err:
       */
       ha_autocommit_or_rollback(thd, 0);
 
+      VOID(pthread_mutex_lock(&LOCK_open));
       /*
         Then do a 'simple' rename of the table. First we need to close all
         instances of 'source' table.
@@ -6884,7 +6884,8 @@ view_err:
           error= -1;
         }
       }
-    }
+    } else
+      VOID(pthread_mutex_lock(&LOCK_open));
 
     if (error == HA_ERR_WRONG_COMMAND)
     {


--===============0258039209==
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\
#   ilgbsz2vyvqrqvty
# target_branch: file:///Users/shulga/projects/mysql/5.1-bugteam-\
#   bug56619/
# testament_sha1: 0aebf1723ac9fa3f77bf051aec1e0e1b41549de9
# timestamp: 2010-10-27 10:20:44 +0700
# base_revision_id: bjorn.munch@stripped\
#   n3fk1njmf0e066n9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaxp0dMAAaxfgFAQWWf//38v
nSC///9yUAQngAkKAAGiJkm0k9T1PRpplPUfqajRo2oAaeUep6jT2pDQ5oyYmACYjAjTAgxGCZMA
jDmjJiYAJiMCNMCDEYJkwCMOaMmJgAmIwI0wIMRgmTAIwSSEEzQBNNGpkxBMmp6jaTE9JtIaDNTz
eLJTQDvd+ieWaaExbxyq+pBSZFysUmCFKeKQgEEp+WyAzMCG4tzz9T0QxqMzMRreTa1tdx5/S4OP
fJTtfavk1z4mOR9suWm3KqPiOYXPvLi/l7zpkvMTOWxf2Iw5u4z84CqgvtfhwUqzyxfLqRSwj0Zy
eK1zntZV2ygObsT0ilQEvYxsi4RIJlKJ59n0ryJGUh3TMmlVxeovjNGpUMvdSo8qELqaxkFDKNxl
ysc+rVNBtSuXxce1Ov/yjhj0S6+22WrwT8LIOrqtwlem4LGczdCkRcKXd3VV0KNm2qeRKqdwp7nh
k/asl+Fp6imNSog4VZQSLJ1bn62JiGJbOcVWuGwlKijBitNw6LJlAcm6OBWUNLLCP3v2SStPHiYL
jNQ/w2SJ958PCTDUrN4+Ba+N9LySelz9d5LNetBELZ1VGiplfTVWnJV8YZFFsTGty3KaWiV/VWt6
YnhS00CE9F+JfB0woJpleSGuov3alZKEcW3qQ9ba54Kxy1P1NY6t1zSySyEBz3qDns4mknCadvab
fI79sbbCTpsrpLORKrdjwiUkwZn8DvcW0L6r8A5ntwOfYLWYFqCPsRiOItwQr8kRrNbguufK2pBC
0VDMT2+zQkIYQ2PAatg9J/zmF8D0+FAjXaqOyskDuIfSj8T66p8q0UDNNl5rl76zzWbH66y07lWJ
totnoZiyCO+jy1fIpG/YslI9aMY6B0UfuM5hGcyRCqGIcvjjxffn57K8TR1yr0iq4NIrCLdJdzXy
NBoxWqXbTjIIKm0XDzxN5M/bhnNfz6q6TSiIPgKHQqAe+h+ps0MdSFS5Dvm+V4jzORQ0pRIRll6a
EDSVsNFMEiHblvsT1U7At2HXdkdfVA6S0vb58+xqJlHQeQoaRQ9hxEpBULmuhPr2KbVx2/VfyqFA
N4W2xnPrIJsAetOBj4eINhLzWKeiMgpCvsCMKf60uknLgzDPm9kH4d0YrwWYYJpsgyU24zCgHuX3
gJ90VwqZkREOCwBhbTDthYVSU1qUQ9o+3NQeUnqsPQxE7XQc+BRQUxVphC6ygcNfOnb12JxGMqnD
jI5Td68VJRSiVkyu6WwzHulra5CmF4PwTN6iJwoW1d71fE0CrYzA8gHTNlCTrLFx3qkCfqFjgLLR
lYzCXL9FBFfPAmzw1K1l3ZSFuQpyWRhkma8fp41w4uKOYuCHaln0ry8mn1N5PeoVn0aUOptBbtjN
Z1lor3Wdd+vcaDqdx2u3dNw1k+qsLQgBI5O5C2Koma6tbsVv4gY19aaVxhk0R+Ny/Jbg4CqFyFUo
Hu79lSgqug2jDIGLNosBTQU5OHh/4u5IpwoSFY06OmA=


--===============0258039209==--