From 4b9bf9d3b87005d6570d76f9de074615d7f8ca36 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 26 Sep 2014 07:04:33 +0200 Subject: [PATCH] bugfix: remove the code that broke XA recovery --- sql/log.h | 6 +----- sql/mysqld.cc | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/sql/log.h b/sql/log.h index 619d7ed19cd..ac1e9f4a70f 100644 --- a/sql/log.h +++ b/sql/log.h @@ -108,11 +108,7 @@ public: int log_and_order(THD *thd, my_xid xid, bool all, bool need_prepare_ordered, bool need_commit_ordered) { - /* - If we are not using WSREP this is an Internal error - - TC_LOG_DUMMY::log_and_order() called - */ - DBUG_ASSERT(IF_WSREP(1,0)); + DBUG_ASSERT(0); return 1; } int unlog(ulong cookie, my_xid xid) { return 0; } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index f842c835f24..e329e2e3ce8 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5101,9 +5101,6 @@ a file name for --log-bin-index option", opt_binlog_index_name); tc_log= get_tc_log_implementation(); - if (WSREP_ON && tc_log == &tc_log_mmap) - tc_log= &tc_log_dummy; - WSREP_DEBUG("Initial TC log open: %s", (tc_log == &mysql_bin_log) ? "binlog" : (tc_log == &tc_log_mmap) ? "mmap" :