bzr commit into mysql-5.1-bugteam branch (Alexey.Kopytov:2838) Bug#43801

[Alexey Kopytov]

#At file:///Users/kaa/src/bzr/bugteam/mysql-5.1-bugteam/ based on revid:zhou.li@stripped

 2838 Alexey Kopytov	2009-03-25
      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.
      modified:
        mysql-test/r/mysql-bug41486.result
        mysql-test/t/mysql-bug41486.test

per-file messages:
  mysql-test/r/mysql-bug41486.result
    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/t/mysql-bug41486.test
    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.
=== modified file 'mysql-test/r/mysql-bug41486.result'
--- a/mysql-test/r/mysql-bug41486.result	2009-03-24 20:44:38 +0000
+++ b/mysql-test/r/mysql-bug41486.result	2009-03-25 07:32:01 +0000
@@ -3,6 +3,9 @@ SET @old_max_allowed_packet= @@global.ma
 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

=== modified file 'mysql-test/t/mysql-bug41486.test'
--- a/mysql-test/t/mysql-bug41486.test	2009-03-24 20:44:38 +0000
+++ b/mysql-test/t/mysql-bug41486.test	2009-03-25 07:32:01 +0000
@@ -30,9 +30,12 @@ let $outfile= $MYSQLTEST_VARDIR/tmp/bug4
 --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;