bugfix: remove the code that broke XA recovery

vuvova · vuvova · commit 4b9bf9d3b870 · 2014-10-01T23:38:27.000+02:00
diff --git a/sql/log.h b/sql/log.h
@@ -108,11 +108,7 @@ class TC_LOG_DUMMY: public TC_LOG // use it to disable the logging
   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
@@ -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" :

Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,7 @@ class TC_LOG_DUMMY: public TC_LOG // use it to disable the logging`
`108`	`108`	`int log_and_order(THD *thd, my_xid xid, bool all,`
`109`	`109`	`bool need_prepare_ordered, bool need_commit_ordered)`
`110`	`110`	`{`
`111`		`- /*`
`112`		`- If we are not using WSREP this is an Internal error`
`113`		`- - TC_LOG_DUMMY::log_and_order() called`
`114`		`- */`
`115`		`- DBUG_ASSERT(IF_WSREP(1,0));`
	`111`	`+ DBUG_ASSERT(0);`
`116`	`112`	`return 1;`
`117`	`113`	`}`
`118`	`114`	`int unlog(ulong cookie, my_xid xid) { return 0; }`