diff options
| author | msvensson@pilot.blaudden <> | 2007-02-20 16:29:56 +0100 |
|---|---|---|
| committer | msvensson@pilot.blaudden <> | 2007-02-20 16:29:56 +0100 |
| commit | 0af1b1956852dbd5297f5ef63202d3175f5d11a0 (patch) | |
| tree | 0ddc95eb2b9e273a3c4ff134568737dbc6581a03 | |
| parent | 0cc2e14040627a93630dbd8ac5169386d7843acd (diff) | |
| download | mariadb-git-0af1b1956852dbd5297f5ef63202d3175f5d11a0.tar.gz | |
Bug#20166 mysql-test-run.pl does not test system privilege tables creation
- Fixes for 5.1
| -rw-r--r-- | sql/log.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index 72baecaf7a6..d745d6dbfc7 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -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)); } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 4ffdc8a75f6..4a9bfd0c0d6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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", |