bzr commit into mysql-6.1-fk branch (dlenev:2738) WL#148

[Dmitry Lenev]

#At file:///home/dlenev/src/bzr/mysql-6.1-mil13/ based on revid:dlenev@stripped

 2738 Dmitry Lenev	2009-07-11 [merge]
      WL#148 "Foreign keys".
      
      Milestone 13 "DDL checks and changes: ALTER, CREATE INDEX, DROP INDEX words".
      
      Work in progress. Merge.

    modified:
      sql/sql_table.cc
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2009-07-11 18:18:08 +0000
+++ b/sql/sql_table.cc	2009-07-11 18:26:15 +0000
@@ -10197,8 +10197,8 @@ view_err:
   {
     /* Close lock if this is a transactional table */
     if (thd->lock &&
-        ! thd->locked_tables_mode == LTM_LOCK_TABLES &&
-        ! thd->locked_tables_mode == LTM_PRELOCKED_UNDER_LOCK_TABLES)
+        ! (thd->locked_tables_mode == LTM_LOCK_TABLES ||
+           thd->locked_tables_mode == LTM_PRELOCKED_UNDER_LOCK_TABLES))
     {
       mysql_unlock_tables(thd, thd->lock);
       thd->lock=0;


Attachment: [text/bzr-bundle] bzr/[e-mail]