diff options
| author | unknown <kent@mysql.com> | 2006-03-18 10:11:36 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-03-18 10:11:36 +0100 |
| commit | c560a5b1d4e874133803d0d7dfe65e7eebca94c3 (patch) | |
| tree | 4a3658c25b511704aa811186b98b9a19372fb890 /sql/ha_innodb.cc | |
| parent | 1a78addd4b4f4e8859cda594a733342fa75f4d60 (diff) | |
| parent | c0c6af35fc7b8eb39fbaaea26b33a20d2f000542 (diff) | |
| download | mariadb-git-c560a5b1d4e874133803d0d7dfe65e7eebca94c3.tar.gz | |
Merge
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index b386439aed5..f656e412e75 100644 --- 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 |