diff options
| author | unknown <jan@hundin.mysql.fi> | 2005-05-02 07:30:17 +0300 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2005-05-02 07:30:17 +0300 |
| commit | 391c84238f4ccb1c4445dce571b86d342ace9ab1 (patch) | |
| tree | 262fe10a6b6288a731fe35d485e70758a01c22e8 /sql | |
| parent | 7ecca388affd6c3aeea2243b383356df71ea34fa (diff) | |
| parent | 4c15ce3aecdde8c5c80d13687addf15e28c9c0ac (diff) | |
| download | mariadb-git-391c84238f4ccb1c4445dce571b86d342ace9ab1.tar.gz | |
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 83c72594dfb..8f9671c5e67 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -5340,15 +5340,14 @@ ha_innobase::store_lock( (lock_type == TL_READ || lock_type == TL_READ_NO_INSERT) && thd->lex->sql_command != SQLCOM_SELECT && thd->lex->sql_command != SQLCOM_UPDATE_MULTI && - thd->lex->sql_command != SQLCOM_DELETE_MULTI ) { + thd->lex->sql_command != SQLCOM_DELETE_MULTI && + thd->lex->sql_command != SQLCOM_LOCK_TABLES) { /* In case we have innobase_locks_unsafe_for_binlog option set and isolation level of the transaction is not set to serializable and MySQL is doing INSERT INTO...SELECT without FOR UPDATE or IN - SHARE MODE we use consistent read for select. - Similarly, in case of DELETE...SELECT and - UPDATE...SELECT when these are not multi table.*/ + SHARE MODE we use consistent read for select. */ prebuilt->select_lock_type = LOCK_NONE; prebuilt->stored_select_lock_type = LOCK_NONE; |