From 2f75c9cd69412de5d3736e775dd302ebdbc1e36d Mon Sep 17 00:00:00 2001
From: "guilhem@gbichot3.local" <>
Date: Thu, 15 Feb 2007 15:50:56 +0100
Subject: [PATCH] Backport from the Falcon tree. When opening/creating the
 transaction coordinator's log, if binlog is used, the tc log is the binlog so
 we use the binlog's name; otherwise we use the mmap-based log, named after
 the mandatory argument of the --log-tc option (meant for that).

---
 sql/log.cc    | 2 +-
 sql/mysqld.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/log.cc b/sql/log.cc
index 1961a5b6f88..aef8e2eff2c 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2523,7 +2523,7 @@ int TC_LOG_MMAP::open(const char *opt_name)
       goto err;
     if (using_heuristic_recover())
       return 1;
-    if ((fd= my_create(logname, O_RDWR, 0, MYF(MY_WME))) < 0)
+    if ((fd= my_create(logname, CREATE_MODE, O_RDWR, MYF(MY_WME))) < 0)
       goto err;
     inited=1;
     file_length= opt_tc_log_size;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d4f9791dade..672f585e721 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3171,7 +3171,7 @@ server.");
                                (TC_LOG *) &tc_log_mmap) :
            (TC_LOG *) &tc_log_dummy);
 
-  if (tc_log->open(opt_bin_logname))
+  if (tc_log->open(opt_bin_log ? opt_bin_logname : opt_tc_log_file))
   {
     sql_print_error("Can't init tc log");
     unireg_abort(1);