diff options
| author | unknown <heikki@hundin.mysql.fi> | 2003-02-05 01:24:59 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2003-02-05 01:24:59 +0200 |
| commit | ed3b80e1b2170b5fb98785bde7d2f872ab20d45f (patch) | |
| tree | 6746b51f8238219aeb633cdfe870dec8699527a0 | |
| parent | dfbd628cd7ec0d3dbe86ee8e4f820d78f10b8ad0 (diff) | |
| download | mariadb-git-ed3b80e1b2170b5fb98785bde7d2f872ab20d45f.tar.gz | |
ha_innodb.cc:
Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place
sql/ha_innodb.cc:
Fix potential bug: if MySQL calls store_lock with the TL_IGNORE argument in the middle of query processing, then InnoDB select_lock_type could be reset to LOCK_NONE in a wrong place
| -rw-r--r-- | sql/ha_innodb.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index f74cddbcee6..7ea18453b13 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4128,7 +4128,10 @@ static void free_share(INNOBASE_SHARE *share) } /********************************************************************* -Stores a MySQL lock into a 'lock' field in a handle. */ +Converts a MySQL table lock stored in the 'lock' field of the handle to +a proper type before storing the lock. MySQL also calls this when it +releases a lock. */ + THR_LOCK_DATA** ha_innobase::store_lock( @@ -4154,8 +4157,13 @@ ha_innobase::store_lock( binlog) requires the use of a locking read */ prebuilt->select_lock_type = LOCK_S; - } else { - /* We set possible LOCK_X value in external_lock, not yet + } else if (lock_type != TL_IGNORE) { + + /* In ha_berkeley.cc there is a comment that MySQL + may in exceptional cases call this with TL_IGNORE also + when it is NOT going to release the lock. */ + + /* We set possible LOCK_X value in external_lock, not yet here even if this would be SELECT ... FOR UPDATE */ prebuilt->select_lock_type = LOCK_NONE; |