From: Date: July 24 2007 6:01am
Subject: bk commit into 5.1 tree (malff:1.2553) BUG#29993
List-Archive: http://lists.mysql.com/commits/31459
X-Bug: 29993
Message-Id: <20070724040138.8D0F78E0A6E@weblab.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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-07-23 22:01:22-06:00, malff@weblab.(none) +2 -0
  Bug#29993 (Default value of log_output should be 'FILE', not 'TABLE')
  
  Changed the default location of the log output to LOG_FILE,
  for backward compatibility with MySQL 5.0

  mysql-test/r/log_state.result@stripped, 2007-07-23 22:01:18-06:00, malff@weblab.(none) +1 -1
    Changed the default location of the log output to LOG_FILE,
    for backward compatibility with MySQL 5.0

  sql/set_var.cc@stripped, 2007-07-23 22:01:18-06:00, malff@weblab.(none) +3 -3
    Changed the default location of the log output to LOG_FILE,
    for backward compatibility with MySQL 5.0

diff -Nrup a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result
--- a/mysql-test/r/log_state.result	2007-02-20 13:00:04 -07:00
+++ b/mysql-test/r/log_state.result	2007-07-23 22:01:18 -06:00
@@ -131,7 +131,7 @@ set global general_log=ON;
 set global log_output=default;
 show variables like 'log_output';
 Variable_name	Value
-log_output	TABLE
+log_output	FILE
 set global general_log=OFF;
 set global log_output=FILE;
 truncate table mysql.general_log;
diff -Nrup a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc	2007-07-19 18:23:29 -06:00
+++ b/sql/set_var.cc	2007-07-23 22:01:18 -06:00
@@ -2220,9 +2220,9 @@ void sys_var_log_output::set_default(THD
 {
   pthread_mutex_lock(&LOCK_global_system_variables);
   logger.lock();
-  logger.init_slow_log(LOG_TABLE);
-  logger.init_general_log(LOG_TABLE);
-  *value= LOG_TABLE;
+  logger.init_slow_log(LOG_FILE);
+  logger.init_general_log(LOG_FILE);
+  *value= LOG_FILE;
   logger.unlock();
   pthread_mutex_unlock(&LOCK_global_system_variables);
 }