From 43b1710c51b685bc52df43622529d1dcfb86bc1e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 3 Aug 2005 18:11:55 +0300 Subject: 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) --- sql/ha_innodb.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/ha_innodb.cc') 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 -- cgit v1.2.1