database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

bugfix: remove the code that broke XA recovery

Browse Source
This commit is contained in:
Sergei Golubchik
2014-09-26 07:04:33 +02:00
parent 3620910eea
commit 4b9bf9d3b8
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/log.h
View File

@@ -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; }

3
sql/mysqld.cc
View File

@@ -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" :