From b4c794d35a704aa6e2efa0ee4b8e3d0f80efefc6 Mon Sep 17 00:00:00 2001
From: Alexey Kopytov <Alexey.Kopytov@sun.com>
Date: Wed, 25 Mar 2009 10:32:01 +0300
Subject: [PATCH] Fix for bug #43801: mysql.test takes too long, fails due to  
                   expired timeout on debx86-b in PB

Turned off general log when importing DB dump in the test
case for bug #41486 due to the bug in CSV engine code that
makes logging long SQL query too slow.
---
 mysql-test/r/mysql-bug41486.result | 3 +++
 mysql-test/t/mysql-bug41486.test   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mysql-test/r/mysql-bug41486.result b/mysql-test/r/mysql-bug41486.result
index 454b5888b49..02777ab587f 100644
--- a/mysql-test/r/mysql-bug41486.result
+++ b/mysql-test/r/mysql-bug41486.result
@@ -3,6 +3,9 @@ SET @old_max_allowed_packet= @@global.max_allowed_packet;
 SET @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024;
 CREATE TABLE t1(data LONGBLOB);
 INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);
+SET @old_general_log = @@global.general_log;
+SET @@global.general_log = 0;
+SET @@global.general_log = @old_general_log;
 SELECT LENGTH(data) FROM t1;
 LENGTH(data)
 2097152
diff --git a/mysql-test/t/mysql-bug41486.test b/mysql-test/t/mysql-bug41486.test
index 805c0f99480..7ea9f6d81c7 100644
--- a/mysql-test/t/mysql-bug41486.test
+++ b/mysql-test/t/mysql-bug41486.test
@@ -30,9 +30,12 @@ let $outfile= $MYSQLTEST_VARDIR/tmp/bug41486.sql;
 --error 0,1
 remove_file $outfile;
 --exec $MYSQL_DUMP test t1 > $outfile
+SET @old_general_log = @@global.general_log;
+SET @@global.general_log = 0;
 # Check that the mysql client does not insert extra newlines when loading
 # strings longer than client's max_allowed_packet
 --exec $MYSQL --max_allowed_packet=1M test < $outfile 2>&1
+SET @@global.general_log = @old_general_log;
 SELECT LENGTH(data) FROM t1;
 
 DROP TABLE t1;