bk commit into 5.0 tree (guilhem:1.2395)

[Guilhem Bichot]

Below is the list of changes that have just been committed into a local
5.0 repository of guilhem. When guilhem does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-15 15:50:56+01:00, guilhem@stripped +2 -0
  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@stripped, 2007-02-15 15:50:54+01:00, guilhem@stripped +1 -1
    fixing wrong order of arguments to my_create()
    (3rd param is the desired modes of the file; "0" lead to no rights
    for anybody on the file).

  sql/mysqld.cc@stripped, 2007-02-15 15:50:54+01:00, guilhem@stripped +1 -1
    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).

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.0-rpl-25507

--- 1.200/sql/log.cc	2007-02-15 15:51:04 +01:00
+++ 1.201/sql/log.cc	2007-02-15 15:51:04 +01:00
@@ -2523,7 +2523,7 @@ int TC_LOG_MMAP::open(const char *opt_na
       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;

--- 1.590/sql/mysqld.cc	2007-02-15 15:51:04 +01:00
+++ 1.591/sql/mysqld.cc	2007-02-15 15:51:04 +01:00
@@ -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);