bk commit into 5.1 tree (msvensson:1.2481) BUG#27070

[msvensson]

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-03-20 11:21:27+01:00, msvensson@stripped +2 -0
  Bug#27070 server logs are created unrequested and in wrong directory
   - Avoid defaault log file names looking like <hostname>.pid.slow.log
    by using the FN_REPLACE_EXT flag to 'fn_format'
   - Remove the default log files generated by log_state.test before
     test completes

  mysql-test/t/log_state.test@stripped, 2007-03-20 11:21:26+01:00, msvensson@stripped +5 -0
    Tess sets location of log files to default location ie. they will be
    created in var/run form which the mysqld was started. Remove the
    files when test are completed

  sql/log.cc@stripped, 2007-03-20 11:21:26+01:00, msvensson@stripped +1 -1
    Replace the extension formatting the default log file name
    from "pidfile_name" which already contains an extension  

# 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/mysql-5.1-maint

--- 1.267/sql/log.cc	2007-03-08 14:29:27 +01:00
+++ 1.268/sql/log.cc	2007-03-20 11:21:26 +01:00
@@ -68,7 +68,7 @@ char *make_default_log_name(char *buff,c
 {
   strmake(buff, pidfile_name, FN_REFLEN-5);
   return fn_format(buff, buff, mysql_data_home, log_ext,
-                   MYF(MY_UNPACK_FILENAME|MY_APPEND_EXT));
+                   MYF(MY_UNPACK_FILENAME|MY_REPLACE_EXT));
 }
 
 /*

--- 1.5/mysql-test/t/log_state.test	2007-02-20 21:00:04 +01:00
+++ 1.6/mysql-test/t/log_state.test	2007-03-20 11:21:26 +01:00
@@ -132,3 +132,8 @@ select * from mysql.general_log;
 # Cleanup (must be done last to avoid delayed 'Quit' message in general log)
 #
 disconnect con1;
+
+# Remove the log files that was created in the "default location"
+# i.e var/run
+--remove_file $MYSQLTEST_VARDIR/run/master.log
+--remove_file $MYSQLTEST_VARDIR/run/master-slow.log