Commit 16f0bd71 authored by kostja@bodhi.(none)'s avatar kostja@bodhi.(none)

Try to fix assertion failures at slave shutdown when running

rpl_ndb tests on sapsrv1.
parent 2e82e666
Branches unavailable
Tags unavailable
No related merge requests found
...@@ -2326,9 +2326,12 @@ static int open_ndb_binlog_index(THD *thd, TABLE_LIST *tables, ...@@ -2326,9 +2326,12 @@ static int open_ndb_binlog_index(THD *thd, TABLE_LIST *tables,
thd->clear_error(); thd->clear_error();
if (open_tables(thd, &tables, &counter, MYSQL_LOCK_IGNORE_FLUSH)) if (open_tables(thd, &tables, &counter, MYSQL_LOCK_IGNORE_FLUSH))
{ {
sql_print_error("NDB Binlog: Opening ndb_binlog_index: %d, '%s'", if (thd->killed)
thd->main_da.sql_errno(), sql_print_error("NDB Binlog: Opening ndb_binlog_index: killed");
thd->main_da.message()); else
sql_print_error("NDB Binlog: Opening ndb_binlog_index: %d, '%s'",
thd->main_da.sql_errno(),
thd->main_da.message());
thd->proc_info= save_proc_info; thd->proc_info= save_proc_info;
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment