diff options
| author | unknown <jan@hundin.mysql.fi> | 2005-04-27 12:28:25 +0300 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2005-04-27 12:28:25 +0300 |
| commit | 734309bb9e5bdaa05d715522fa6d17e6aeb663a4 (patch) | |
| tree | 937ad3e12a7a596e4237b509eae02f07756dc54c | |
| parent | 18bbc26d4ff6a7f366b4a87756b47c15dd0ae902 (diff) | |
| download | mariadb-git-734309bb9e5bdaa05d715522fa6d17e6aeb663a4.tar.gz | |
Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200).
sql/ha_innodb.cc:
Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200).
Lock type must be stored when sql_command = SQLCOM_LOCK_TABLES and
lock_type = TL_READ or TL_READ_INSERT even when
innobase_locks_unsafe_for_binlog is set.
| -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; |