Commit 1e98e7bf authored by unknown's avatar unknown

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
...@@ -75,7 +75,7 @@ sql_print_message_func sql_print_message_handlers[3] = ...@@ -75,7 +75,7 @@ sql_print_message_func sql_print_message_handlers[3] =
char *make_default_log_name(char *buff,const char* log_ext) 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, return fn_format(buff, buff, mysql_data_home, log_ext,
MYF(MY_UNPACK_FILENAME|MY_APPEND_EXT)); MYF(MY_UNPACK_FILENAME|MY_APPEND_EXT));
} }
......
...@@ -3120,7 +3120,7 @@ static int init_server_components() ...@@ -3120,7 +3120,7 @@ static int init_server_components()
if (opt_error_log) if (opt_error_log)
{ {
if (!log_error_file_ptr[0]) 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 */ MY_REPLACE_EXT); /* replace '.<domain>' by '.err', bug#4997 */
else else
fn_format(log_error_file, log_error_file_ptr, mysql_data_home, ".err", fn_format(log_error_file, log_error_file_ptr, mysql_data_home, ".err",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment