Merge mysql.com:/home/mydev/mysql-4.1

into mysql.com:/home/mydev/mysql-4.1-4100

Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
8428c5e5 · unknown · 55f964e4 · c190de54 · 8428c5e5
Commit 8428c5e5 authored Aug 12, 2004 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/mysqld.cc sql/mysqld.cc +2 -1

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2535,7 +2535,8 @@ server.");
  if (opt_error_log)
  {
    if (!log_error_file_ptr[0])
-      fn_format(log_error_file, glob_hostname, mysql_data_home, ".err", 0);
+      fn_format(log_error_file, glob_hostname, 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",
 		MY_UNPACK_FILENAME | MY_SAFE_PATH);