mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge hundin.mysql.fi:/home/heikki/mysql-4.0

Browse source 
into hundin.mysql.fi:/home/heikki/mysql-4.1
This commit is contained in:
heikki@hundin.mysql.fi 2004-12-22 11:09:09 +02:00
commit 73f61e9d15
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/ha_innodb.cc
View file

@ -5051,7 +5051,8 @@ ha_innobase::external_lock(
if (prebuilt->select_lock_type != LOCK_NONE) { if (prebuilt->select_lock_type != LOCK_NONE) {
if (thd->in_lock_tables && if (thd->in_lock_tables &&
thd->variables.innodb_table_locks) { thd->variables.innodb_table_locks &&
(thd->options & OPTION_NOT_AUTOCOMMIT)) {
ulint error; ulint error;
error = row_lock_table_for_mysql(prebuilt, error = row_lock_table_for_mysql(prebuilt,
NULL, LOCK_TABLE_EXP); NULL, LOCK_TABLE_EXP);