diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-09-26 07:04:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-01 23:38:27 +0200 |
| commit | 4b9bf9d3b87005d6570d76f9de074615d7f8ca36 (patch) | |
| tree | 1febf79507df8756bd30bff54cd579a1b1c90297 /sql/log.h | |
| parent | 3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98 (diff) | |
| download | mariadb-git-4b9bf9d3b87005d6570d76f9de074615d7f8ca36.tar.gz | |
bugfix: remove the code that broke XA recovery
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 6 |
1 files changed, 1 insertions, 5 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; } |