Commit 8dcb03f7 authored by unknown's avatar unknown
Browse files

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

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


sql/ha_innodb.cc:
  Auto merged
parents 5f767b11 360d1cd0

sql/ha_innodb.cc

+2 −1
Original line number Diff line number Diff line
@@ -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;

      		}