diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-08-03 18:11:55 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-08-03 18:11:55 +0300 |
| commit | 43b1710c51b685bc52df43622529d1dcfb86bc1e (patch) | |
| tree | 64f235a48a6aae38f9b577d50766090fab25d6be /sql/ha_innodb.cc | |
| parent | 451ec64db9acb6c4a590b64b5077ca72041e6cdf (diff) | |
| download | mariadb-git-43b1710c51b685bc52df43622529d1dcfb86bc1e.tar.gz | |
ha_innodb.cc:
Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)
sql/ha_innodb.cc:
Backport of Bug #9670 to 4.0: assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED)
Diffstat (limited to 'sql/ha_innodb.cc')
| -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 81a803e36b9..31c26f774a6 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4928,7 +4928,8 @@ ha_innobase::store_lock( (lock_type == TL_READ_HIGH_PRIORITY && thd->in_lock_tables) || lock_type == TL_READ_WITH_SHARED_LOCKS || lock_type == TL_READ_NO_INSERT || - thd->lex.sql_command != SQLCOM_SELECT) { + (thd->lex->sql_command != SQLCOM_SELECT + && lock_type != TL_IGNORE)) { /* The OR cases above are in this order: 1) MySQL is doing LOCK TABLES ... READ LOCAL, or |