diff options
| author | heikki@hundin.mysql.fi <> | 2003-02-05 01:42:07 +0200 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2003-02-05 01:42:07 +0200 |
| commit | a30d3cd8473e7d4ad3412a042741f34dcb004e80 (patch) | |
| tree | 66678af776f7a3ccfbc72cc1c3ec3854590a4e8c /sql | |
| parent | 3fbbe686ee802461ef293181f952911c253639a6 (diff) | |
| download | mariadb-git-a30d3cd8473e7d4ad3412a042741f34dcb004e80.tar.gz | |
ha_innobase.cc:
Backport from 4.0: fix potential bug if store_lock is called with TL_IGNORE in the middle of a query
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innobase.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index 7045e5c31d5..5b2af70f34e 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -3700,7 +3700,7 @@ ha_innobase::store_lock( binlog) requires the use of a locking read */ prebuilt->select_lock_type = LOCK_S; - } else { + } else if (lock_type != TL_IGNORE) { /* We set possible LOCK_X value in external_lock, not yet here even if this would be SELECT ... FOR UPDATE */ |