diff options
| author | unknown <kent@mysql.com> | 2006-03-17 11:32:02 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-03-17 11:32:02 +0100 |
| commit | 3adad925fe6a6c4527375cda91e33fc262770cea (patch) | |
| tree | b4f8ad4e3f423ae1274a7809354ea4f68d0d0977 | |
| parent | fb71f423c4053f108048d463df64094aef32c7bc (diff) | |
| download | mariadb-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
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 7a571da7d77..5a111432071 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! # remember to also change ndb version below and update version.c in ndb -AM_INIT_AUTOMAKE(mysql, 5.0.19) +AM_INIT_AUTOMAKE(mysql, 5.0.19a) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=19 +NDB_VERSION_BUILD=19a NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? 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 |