Commit 1e98e7bf authored by unknown's avatar unknown
Browse files

Bug#20166 mysql-test-run.pl does not test system privilege tables creation 

 - Fixes for 5.1


sql/log.cc:
  Use "pidfile_name" instead of "glob_hostname" as base for
  log file name
sql/mysqld.cc:
  Use "pidfile_name" instead of "glob_hostname" as base for
  log file name
parent 1125ce9a

sql/log.cc

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ sql_print_message_func sql_print_message_handlers[3] = 


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));

}

sql/mysqld.cc

+1 −1
Original line number Diff line number Diff line
@@ -3120,7 +3120,7 @@ static int init_server_components() 
  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",