Merge

sql/ha_innodb.cc: Auto merged

Merge
sql/ha_innodb.cc: Auto merged
c560a5b1 · unknown · 1a78addd · c0c6af35 · c560a5b1
Commit c560a5b1 authored Mar 18, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -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