diff options
| author | unknown <kostja@bodhi.(none)> | 2007-12-15 22:24:01 +0300 |
|---|---|---|
| committer | unknown <kostja@bodhi.(none)> | 2007-12-15 22:24:01 +0300 |
| commit | 7213ca204dc3d10f751ca2507321eede1238d6cb (patch) | |
| tree | c84244ca9e9047c97d52692444d32257cf3e0a9b /sql/ha_ndbcluster_binlog.cc | |
| parent | b8671579357f500fd9b9839ddc51bb1f9fd5cbb9 (diff) | |
| download | mariadb-git-7213ca204dc3d10f751ca2507321eede1238d6cb.tar.gz | |
Try to fix assertion failures at slave shutdown when running
rpl_ndb tests on sapsrv1.
sql/ha_ndbcluster_binlog.cc:
Try to fix assertion failures at slave shutdown when running
rpl_ndb tests. If the binlog thread is killed, which happens during
shutdown, open_tables returns error without setting an error
in THD. Therefore one can't access thd->main_da.message() if thd->killed.
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 9 |
1 files 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; } |