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

Try to fix assertion failures at slave shutdown when running

Browse Source 
rpl_ndb tests on sapsrv1.
This commit is contained in:
kostja@bodhi.(none) 2007-12-15 22:24:01 +03:00
parent 2e82e66677
commit 16f0bd712e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sql/ha_ndbcluster_binlog.cc
View File

@ -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;
} }