From 16f0bd712e184deda90f91a0e9ec2a13a6db22bf Mon Sep 17 00:00:00 2001
From: "kostja@bodhi.(none)" <>
Date: Sat, 15 Dec 2007 22:24:01 +0300
Subject: [PATCH] Try to fix assertion failures at slave shutdown when running
 rpl_ndb tests on sapsrv1.

---
 sql/ha_ndbcluster_binlog.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
index 0e7ca28fd2a..07b0d907229 100644
--- 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'",
-                    thd->main_da.sql_errno(),
-                    thd->main_da.message());
+    if (thd->killed)
+      sql_print_error("NDB Binlog: Opening ndb_binlog_index: killed");
+    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;
   }