Commit 36da0963 authored by kent@mysql.com's avatar kent@mysql.com
Browse files

Merge

parents eebe4fb8 7e48f7b3

sql/ha_innodb.cc

+2 −2
Original line number Diff line number Diff line
@@ -6891,8 +6891,8 @@ ha_innobase::store_lock( 


    		if ((lock_type >= TL_WRITE_CONCURRENT_INSERT 

		    && lock_type <= TL_WRITE)

		    && (!thd->in_lock_tables

			|| thd->lex->sql_command == SQLCOM_CALL)

		    && !(thd->in_lock_tables

                         && thd->lex->sql_command == SQLCOM_LOCK_TABLES)

		    && !thd->tablespace_op

		    && thd->lex->sql_command != SQLCOM_TRUNCATE

		    && thd->lex->sql_command != SQLCOM_OPTIMIZE