summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.cc
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2006-03-17 11:32:02 +0100
committerunknown <kent@mysql.com>2006-03-17 11:32:02 +0100
commit3adad925fe6a6c4527375cda91e33fc262770cea (patch)
treeb4f8ad4e3f423ae1274a7809354ea4f68d0d0977 /sql/ha_innodb.cc
parentfb71f423c4053f108048d463df64094aef32c7bc (diff)
downloadmariadb-git-3adad925fe6a6c4527375cda91e33fc262770cea.tar.gz
configure.in:
Changed release name to 5.0.19a ha_innodb.cc: InnoDB used table locks (not row locks) within stored functions. (Bug #18077) sql/ha_innodb.cc: InnoDB used table locks (not row locks) within stored functions. (Bug #18077) configure.in: Changed release name to 5.0.19a
Diffstat (limited to 'sql/ha_innodb.cc')
-rw-r--r--sql/ha_innodb.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index 1b1326920ad..4a10c5f7fae 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -6884,8 +6884,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