From: msvensson
Date: February 20 2007 3:30pm
Subject: bk commit into 5.1 tree (msvensson:1.2445) BUG#20166
List-Archive: http://lists.mysql.com/commits/20187
X-Bug: 20166
Message-Id: <200702201530.l1KFU0OB028717@pilot.blaudden>

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-20 16:29:56+01:00, msvensson@stripped +2 -0
  Bug#20166 mysql-test-run.pl does not test system privilege tables creation
   - Fixes for 5.1

  sql/log.cc@stripped, 2007-02-20 16:29:54+01:00, msvensson@stripped +1 -1
    Use "pidfile_name" instead of "glob_hostname" as base for
    log file name

  sql/mysqld.cc@stripped, 2007-02-20 16:29:54+01:00, msvensson@stripped +1 -1
    Use "pidfile_name" instead of "glob_hostname" as base for
    log file name

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug20166/my51-bug20166

--- 1.256/sql/log.cc	2007-02-20 16:26:29 +01:00
+++ 1.257/sql/log.cc	2007-02-20 16:29:54 +01:00
@@ -75,7 +75,7 @@
 
 char *make_default_log_name(char *buff,const char* log_ext)
 {
-  strmake(buff, glob_hostname, FN_REFLEN-5);
+  strmake(buff, pidfile_name, FN_REFLEN-5);
   return fn_format(buff, buff, mysql_data_home, log_ext,
                    MYF(MY_UNPACK_FILENAME|MY_APPEND_EXT));
 }

--- 1.620/sql/mysqld.cc	2007-02-20 16:26:29 +01:00
+++ 1.621/sql/mysqld.cc	2007-02-20 16:29:54 +01:00
@@ -3120,7 +3120,7 @@
   if (opt_error_log)
   {
     if (!log_error_file_ptr[0])
-      fn_format(log_error_file, glob_hostname, mysql_data_home, ".err",
+      fn_format(log_error_file, pidfile_name, mysql_data_home, ".err",
                 MY_REPLACE_EXT); /* replace '.<domain>' by '.err', bug#4997 */
     else
       fn_format(log_error_file, log_error_file_ptr, mysql_data_home, ".err",