diff options
| author | kent@mysql.com <> | 2006-03-17 11:32:02 +0100 |
|---|---|---|
| committer | kent@mysql.com <> | 2006-03-17 11:32:02 +0100 |
| commit | 882d9b6e1f93be14b5bb75de0fe937b32239e392 (patch) | |
| tree | b4f8ad4e3f423ae1274a7809354ea4f68d0d0977 /sql/ha_innodb.cc | |
| parent | 951943c22a84b50eeadb0339689c24209095d269 (diff) | |
| download | mariadb-git-882d9b6e1f93be14b5bb75de0fe937b32239e392.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)
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 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 |