Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
324c20d4 · serg@serg.mylan · dbcf3b3a · d21b8d10 · 324c20d4
Commit 324c20d4 authored May 27, 2005 by serg@serg.mylan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/ha_innodb.cc sql/ha_innodb.cc +2 -1

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -5420,7 +5420,8 @@ ha_innobase::store_lock(
    		if ((lock_type >= TL_WRITE_CONCURRENT_INSERT &&
 	 	    lock_type <= TL_WRITE) && !thd->in_lock_tables
-		    && !thd->tablespace_op) {
+		    && !thd->tablespace_op
+                    && thd->lex->sql_command != SQLCOM_CREATE_TABLE) {
      			lock_type = TL_WRITE_ALLOW_WRITE;
      		}