Local merge of mariadb-5.5.39

bzr merge -r4264 maria/5.5

Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.

1 files changed, 7 insertions, 15 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 888900565db..8d1365a40b6 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4566,6 +4566,8 @@ a file name for --log-bin-index option", opt_binlog_index_name);
   if (ha_init_errors())
     DBUG_RETURN(1);
 
+  tc_log= 0; // ha_initialize_handlerton() needs that
+
   if (plugin_init(&remaining_argc, remaining_argv,
                   (opt_noacl ? PLUGIN_INIT_SKIP_PLUGIN_TABLE : 0) |
                   (opt_abort ? PLUGIN_INIT_SKIP_INITIALIZATION : 0)))
@@ -4715,23 +4717,13 @@ a file name for --log-bin-index option", opt_binlog_index_name);
   }
 #endif
 
-  tc_log= (total_ha_2pc > 1 ? (opt_bin_log  ?
-                               (TC_LOG *) &mysql_bin_log :
-#ifdef WITH_WSREP
-                               (WSREP_ON ? 
-                                (TC_LOG *) &tc_log_dummy : 
-                                (TC_LOG *) &tc_log_mmap)) :
-#else
-                               (TC_LOG *) &tc_log_mmap) :
-#endif
-    (TC_LOG *) &tc_log_dummy);
+  tc_log= get_tc_log_implementation();
+
 #ifdef WITH_WSREP
-  WSREP_DEBUG("Initial TC log open: %s", 
-              (tc_log == &mysql_bin_log) ? "binlog" :
-              (tc_log == &tc_log_mmap) ? "mmap" :
-              (tc_log == &tc_log_dummy) ? "dummy" : "unknown"
-              );
+  if (WSREP_ON && tc_log == &tc_log_mmap)
+    tc_log= &tc_log_dummy;
 #endif
+
   if (tc_log->open(opt_bin_log ? opt_bin_logname : opt_tc_log_file))
   {
     sql_print_error("Can't init tc log");