1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.1 to mysql-5.5.

Browse Source
This commit is contained in:
Annamalai Gurusami 2012-06-01 11:49:07 +05:30
commit 633fcac144
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.cc
View File

@ -12075,7 +12075,8 @@ int report_error(TABLE *table, int error)
Locking reads can legally return also these errors, do not Locking reads can legally return also these errors, do not
print them to the .err log print them to the .err log
*/ */
if (error != HA_ERR_LOCK_DEADLOCK && error != HA_ERR_LOCK_WAIT_TIMEOUT) if (error != HA_ERR_LOCK_DEADLOCK && error != HA_ERR_LOCK_WAIT_TIMEOUT
&& !table->in_use->killed)
sql_print_error("Got error %d when reading table '%s'", sql_print_error("Got error %d when reading table '%s'",
error, table->s->path.str); error, table->s->path.str);
table->file->print_error(error,MYF(0)); table->file->print_error(error,MYF(0));

1
storage/innobase/handler/ha_innodb.cc
View File

@ -5878,6 +5878,7 @@ ha_innobase::index_read(
ulint ret; ulint ret;
DBUG_ENTER("index_read"); DBUG_ENTER("index_read");
DEBUG_SYNC_C("ha_innobase_index_read_begin");
ut_a(prebuilt->trx == thd_to_trx(user_thd)); ut_a(prebuilt->trx == thd_to_trx(user_thd));
ut_ad(key_len != 0 || find_flag != HA_READ_KEY_EXACT); ut_ad(key_len != 0 || find_flag != HA_READ_KEY_EXACT);