Commit 43b1710c authored by unknown's avatar unknown
Browse files

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)
parent 451ec64d

sql/ha_innodb.cc

+2 −1
Original line number Diff line number Diff line
@@ -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