From d458d55755d7acc83db89d6ca0e2cf008000a8c7 Mon Sep 17 00:00:00 2001
From: Bjorn Munch <Bjorn.Munch@sun.com>
Date: Thu, 27 Aug 2009 15:17:09 +0200
Subject: [PATCH] Bug #46322 Sporadic timeout in mysql_upgrade.test Apparently
 caused by logging to table Turn on logging to file only, add to .opt file for
 tests needing log to table

---
 mysql-test/mysql-test-run.pl              | 4 ++--
 mysql-test/t/events_logs_tests-master.opt | 2 +-
 mysql-test/t/log_tables-master.opt        | 2 +-
 mysql-test/t/ps-master.opt                | 2 +-
 mysql-test/t/show_check-master.opt        | 2 +-
 mysql-test/t/status-master.opt            | 1 +
 6 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 mysql-test/t/status-master.opt

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index c15f3990ec4..429fbfe41c6 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -4105,8 +4105,8 @@ sub mysqld_arguments ($$$) {
 
   if ( $mysql_version_id >= 50106 )
   {
-    # Turn on logging to both tables and file
-    mtr_add_arg($args, "--log-output=table,file");
+    # Turn on logging to file
+    mtr_add_arg($args, "--log-output=file");
   }
 
   # Check if "extra_opt" contains skip-log-bin
diff --git a/mysql-test/t/events_logs_tests-master.opt b/mysql-test/t/events_logs_tests-master.opt
index 35ff7911705..3ece9710a45 100644
--- a/mysql-test/t/events_logs_tests-master.opt
+++ b/mysql-test/t/events_logs_tests-master.opt
@@ -1 +1 @@
---log-slow-queries
+--log-output=table,file --log-slow-queries
diff --git a/mysql-test/t/log_tables-master.opt b/mysql-test/t/log_tables-master.opt
index 35ff7911705..3ece9710a45 100644
--- a/mysql-test/t/log_tables-master.opt
+++ b/mysql-test/t/log_tables-master.opt
@@ -1 +1 @@
---log-slow-queries
+--log-output=table,file --log-slow-queries
diff --git a/mysql-test/t/ps-master.opt b/mysql-test/t/ps-master.opt
index 3eb98fc3d6b..31c287d2bb5 100644
--- a/mysql-test/t/ps-master.opt
+++ b/mysql-test/t/ps-master.opt
@@ -1 +1 @@
---log-slow-queries --log-long-format --log-queries-not-using-indexes
+--log-output=table,file --log-slow-queries --log-long-format --log-queries-not-using-indexes
diff --git a/mysql-test/t/show_check-master.opt b/mysql-test/t/show_check-master.opt
index 7a438da06cc..aab832e2848 100644
--- a/mysql-test/t/show_check-master.opt
+++ b/mysql-test/t/show_check-master.opt
@@ -1 +1 @@
---log-slow-queries --log-long-format --log-queries-not-using-indexes --myisam-recover=""
+--log-output=table,file --log-slow-queries --log-long-format --log-queries-not-using-indexes --myisam-recover=""
diff --git a/mysql-test/t/status-master.opt b/mysql-test/t/status-master.opt
new file mode 100644
index 00000000000..eb3bb4fe50d
--- /dev/null
+++ b/mysql-test/t/status-master.opt
@@ -0,0 +1 @@
+--log-output=table,file