From d1d93f7412fb65208fe11c11d71cc1fc4b6d9710 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 28 Nov 2006 17:13:38 +0100
Subject: [PATCH 1/3] Fix spelling error reported by Paul

---
 sql/mysqld.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index a5c465d2408..47b6637720c 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2789,13 +2789,13 @@ static int init_common_variables(const char *conf_file_name, int argc,
       !(log_output_options & LOG_NONE))
     sql_print_warning("Although a path was specified for the "
                       "--log option, log tables are used. "
-                      "To enable logging to file use the --log-output option.");
+                      "To enable logging to files use the --log-output option.");
 
   if (opt_slow_log && opt_slow_logname && !(log_output_options & LOG_FILE)
       && !(log_output_options & LOG_NONE))
     sql_print_warning("Although a path was specified for the "
                       "--log-slow-queries option, log tables are used. "
-                      "To enable logging to file use the --log-output option.");
+                      "To enable logging to files use the --log-output option.");
 
   if (!opt_logname)
     opt_logname= make_default_log_name(buff, ".log");

From 0aa9ac852f8e9b7f45f5623e253846e44c5e06cf Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 28 Nov 2006 19:12:59 +0100
Subject: [PATCH 2/3] Tell mysqld where to put the log file

---
 mysql-test/t/mysql_client_test-master.opt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/t/mysql_client_test-master.opt b/mysql-test/t/mysql_client_test-master.opt
index 3711946168d..2dfcc4a2fb9 100644
--- a/mysql-test/t/mysql_client_test-master.opt
+++ b/mysql-test/t/mysql_client_test-master.opt
@@ -1 +1 @@
---log --log-output=FILE 
+--log=$MYSQLTEST_VARDIR/log/master.log --log-output=FILE 

From 5f4acf145b662a8da13484f9a2eb866b9f286697 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Wed, 29 Nov 2006 22:49:02 +0100
Subject: [PATCH 3/3] After 5.1.6 just turn on logging, it will be sent to
 tables by default

---
 mysql-test/mysql-test-run.pl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 0859b02167c..0b630c1f722 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3474,6 +3474,11 @@ sub mysqld_arguments ($$$$$) {
       # Force mysqld to use log files up until 5.1.6
       mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});
     }
+    else
+    {
+      # Turn on logging, will be sent to tables
+      mtr_add_arg($args, "%s--log=", $prefix);
+    }
   }
 
   if ( $type eq 'slave' )
@@ -3557,6 +3562,11 @@ sub mysqld_arguments ($$$$$) {
       # Force mysqld to use log files up until 5.1.6
       mtr_add_arg($args, "%s--log=%s", $prefix, $master->[0]->{'path_mylog'});
     }
+    else
+    {
+      # Turn on logging, will be sent to tables
+      mtr_add_arg($args, "%s--log=", $prefix);
+    }
 
   } # end slave