diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-12-22 11:09:09 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-12-22 11:09:09 +0200 |
| commit | 6fa467666d69ecda10333a17b008ddfc0a1b26ea (patch) | |
| tree | 0299270cb0bbdc1c933372518d2ed5e8f066c50d /sql | |
| parent | 4e6fb94d86a5262fe425983d5e3952b29716b960 (diff) | |
| parent | e6dfed9f4cb88406dec37ffb5ca1fa0b0f2b3e75 (diff) | |
| download | mariadb-git-6fa467666d69ecda10333a17b008ddfc0a1b26ea.tar.gz | |
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index cc69762cbdb..20837e2172d 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -5051,7 +5051,8 @@ ha_innobase::external_lock( if (prebuilt->select_lock_type != LOCK_NONE) { if (thd->in_lock_tables && - thd->variables.innodb_table_locks) { + thd->variables.innodb_table_locks && + (thd->options & OPTION_NOT_AUTOCOMMIT)) { ulint error; error = row_lock_table_for_mysql(prebuilt, NULL, LOCK_TABLE_EXP); |