Try to fix assertion failures at slave shutdown when running

rpl_ndb tests on sapsrv1.

Try to fix assertion failures at slave shutdown when running
rpl_ndb tests on sapsrv1.
16f0bd71 · kostja@bodhi.(none) · 2e82e666 · 16f0bd71
Commit 16f0bd71 authored Dec 15, 2007 by kostja@bodhi.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_binlog.cc +6 -3

No files found.
--- a/sql/ha_ndbcluster_binlog.cc
+++ b/sql/ha_ndbcluster_binlog.cc
@@ -2326,9 +2326,12 @@ static int open_ndb_binlog_index(THD *thd, TABLE_LIST *tables,
  thd->clear_error();
  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;
    return -1;
  }