Speed up of test suite:

- Added --disable_query_log ; begin ; .... commit; --enable_query_log around all while loops that does insert

mysql-test/r/alter_table.result

@@ -143,16 +143,6 @@ t1	1	n4	1	n4	A	NULL	NULL	NULL	YES	BTREE	disabled
 t1	1	n4	2	n1	A	NULL	NULL	NULL		BTREE	disabled
 t1	1	n4	3	n2	A	NULL	NULL	NULL	YES	BTREE	disabled
 t1	1	n4	4	n3	A	NULL	NULL	NULL	YES	BTREE	disabled
-insert into t1 values(10,RAND()*1000,RAND()*1000,RAND());
-insert into t1 values(9,RAND()*1000,RAND()*1000,RAND());
-insert into t1 values(8,RAND()*1000,RAND()*1000,RAND());
-insert into t1 values(7,RAND()*1000,RAND()*1000,RAND());
-insert into t1 values(6,RAND()*1000,RAND()*1000,RAND());
-insert into t1 values(5,RAND()*1000,RAND()*1000,RAND());
-insert into t1 values(4,RAND()*1000,RAND()*1000,RAND());
-insert into t1 values(3,RAND()*1000,RAND()*1000,RAND());
-insert into t1 values(2,RAND()*1000,RAND()*1000,RAND());
-insert into t1 values(1,RAND()*1000,RAND()*1000,RAND());
 alter table t1 enable keys;
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
@@ -183,106 +173,6 @@ i	int(10) unsigned	NO	PRI	NULL	auto_increment
 c	char(10)	YES		NULL	
 drop table t1;
 create table t1 (a int, b int);
-insert into t1 values(1,100), (2,100), (3, 100);
-insert into t1 values(1,99), (2,99), (3, 99);
-insert into t1 values(1,98), (2,98), (3, 98);
-insert into t1 values(1,97), (2,97), (3, 97);
-insert into t1 values(1,96), (2,96), (3, 96);
-insert into t1 values(1,95), (2,95), (3, 95);
-insert into t1 values(1,94), (2,94), (3, 94);
-insert into t1 values(1,93), (2,93), (3, 93);
-insert into t1 values(1,92), (2,92), (3, 92);
-insert into t1 values(1,91), (2,91), (3, 91);
-insert into t1 values(1,90), (2,90), (3, 90);
-insert into t1 values(1,89), (2,89), (3, 89);
-insert into t1 values(1,88), (2,88), (3, 88);
-insert into t1 values(1,87), (2,87), (3, 87);
-insert into t1 values(1,86), (2,86), (3, 86);
-insert into t1 values(1,85), (2,85), (3, 85);
-insert into t1 values(1,84), (2,84), (3, 84);
-insert into t1 values(1,83), (2,83), (3, 83);
-insert into t1 values(1,82), (2,82), (3, 82);
-insert into t1 values(1,81), (2,81), (3, 81);
-insert into t1 values(1,80), (2,80), (3, 80);
-insert into t1 values(1,79), (2,79), (3, 79);
-insert into t1 values(1,78), (2,78), (3, 78);
-insert into t1 values(1,77), (2,77), (3, 77);
-insert into t1 values(1,76), (2,76), (3, 76);
-insert into t1 values(1,75), (2,75), (3, 75);
-insert into t1 values(1,74), (2,74), (3, 74);
-insert into t1 values(1,73), (2,73), (3, 73);
-insert into t1 values(1,72), (2,72), (3, 72);
-insert into t1 values(1,71), (2,71), (3, 71);
-insert into t1 values(1,70), (2,70), (3, 70);
-insert into t1 values(1,69), (2,69), (3, 69);
-insert into t1 values(1,68), (2,68), (3, 68);
-insert into t1 values(1,67), (2,67), (3, 67);
-insert into t1 values(1,66), (2,66), (3, 66);
-insert into t1 values(1,65), (2,65), (3, 65);
-insert into t1 values(1,64), (2,64), (3, 64);
-insert into t1 values(1,63), (2,63), (3, 63);
-insert into t1 values(1,62), (2,62), (3, 62);
-insert into t1 values(1,61), (2,61), (3, 61);
-insert into t1 values(1,60), (2,60), (3, 60);
-insert into t1 values(1,59), (2,59), (3, 59);
-insert into t1 values(1,58), (2,58), (3, 58);
-insert into t1 values(1,57), (2,57), (3, 57);
-insert into t1 values(1,56), (2,56), (3, 56);
-insert into t1 values(1,55), (2,55), (3, 55);
-insert into t1 values(1,54), (2,54), (3, 54);
-insert into t1 values(1,53), (2,53), (3, 53);
-insert into t1 values(1,52), (2,52), (3, 52);
-insert into t1 values(1,51), (2,51), (3, 51);
-insert into t1 values(1,50), (2,50), (3, 50);
-insert into t1 values(1,49), (2,49), (3, 49);
-insert into t1 values(1,48), (2,48), (3, 48);
-insert into t1 values(1,47), (2,47), (3, 47);
-insert into t1 values(1,46), (2,46), (3, 46);
-insert into t1 values(1,45), (2,45), (3, 45);
-insert into t1 values(1,44), (2,44), (3, 44);
-insert into t1 values(1,43), (2,43), (3, 43);
-insert into t1 values(1,42), (2,42), (3, 42);
-insert into t1 values(1,41), (2,41), (3, 41);
-insert into t1 values(1,40), (2,40), (3, 40);
-insert into t1 values(1,39), (2,39), (3, 39);
-insert into t1 values(1,38), (2,38), (3, 38);
-insert into t1 values(1,37), (2,37), (3, 37);
-insert into t1 values(1,36), (2,36), (3, 36);
-insert into t1 values(1,35), (2,35), (3, 35);
-insert into t1 values(1,34), (2,34), (3, 34);
-insert into t1 values(1,33), (2,33), (3, 33);
-insert into t1 values(1,32), (2,32), (3, 32);
-insert into t1 values(1,31), (2,31), (3, 31);
-insert into t1 values(1,30), (2,30), (3, 30);
-insert into t1 values(1,29), (2,29), (3, 29);
-insert into t1 values(1,28), (2,28), (3, 28);
-insert into t1 values(1,27), (2,27), (3, 27);
-insert into t1 values(1,26), (2,26), (3, 26);
-insert into t1 values(1,25), (2,25), (3, 25);
-insert into t1 values(1,24), (2,24), (3, 24);
-insert into t1 values(1,23), (2,23), (3, 23);
-insert into t1 values(1,22), (2,22), (3, 22);
-insert into t1 values(1,21), (2,21), (3, 21);
-insert into t1 values(1,20), (2,20), (3, 20);
-insert into t1 values(1,19), (2,19), (3, 19);
-insert into t1 values(1,18), (2,18), (3, 18);
-insert into t1 values(1,17), (2,17), (3, 17);
-insert into t1 values(1,16), (2,16), (3, 16);
-insert into t1 values(1,15), (2,15), (3, 15);
-insert into t1 values(1,14), (2,14), (3, 14);
-insert into t1 values(1,13), (2,13), (3, 13);
-insert into t1 values(1,12), (2,12), (3, 12);
-insert into t1 values(1,11), (2,11), (3, 11);
-insert into t1 values(1,10), (2,10), (3, 10);
-insert into t1 values(1,9), (2,9), (3, 9);
-insert into t1 values(1,8), (2,8), (3, 8);
-insert into t1 values(1,7), (2,7), (3, 7);
-insert into t1 values(1,6), (2,6), (3, 6);
-insert into t1 values(1,5), (2,5), (3, 5);
-insert into t1 values(1,4), (2,4), (3, 4);
-insert into t1 values(1,3), (2,3), (3, 3);
-insert into t1 values(1,2), (2,2), (3, 2);
-insert into t1 values(1,1), (2,1), (3, 1);
 alter table t1 add unique (a,b), add key (b);
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

mysql-test/r/func_misc.result

@@ -116,10 +116,6 @@ CREATE TEMPORARY TABLE t_history (attempt SMALLINT,
 start_ts DATETIME, end_ts DATETIME,
 start_cached INTEGER, end_cached INTEGER);
 CREATE TABLE t1 (f1 BIGINT);
-INSERT INTO t1 VALUES (1);
-INSERT INTO t1 VALUES (1);
-INSERT INTO t1 VALUES (1);
-INSERT INTO t1 VALUES (1);
 INSERT INTO t_history
 SET attempt = 4 - 4 + 1, start_ts = NOW(),
 start_cached = 0;

mysql-test/r/innodb_xtradb_bug317074.result

@@ -3,3 +3,30 @@ SET @old_innodb_file_per_table=@@innodb_file_per_table;
 SET @old_innodb_file_format_check=@@innodb_file_format_check;
 SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
+DROP TABLE IF EXISTS `test1`;
+CREATE TABLE IF NOT EXISTS `test1` (
+`a` int primary key auto_increment,
+`b` int default 0,
+`c` char(100) default 'testtest'
+) ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+set autocommit=0;
+CREATE PROCEDURE insert_many(p1 int)
+BEGIN
+SET @x = 0;
+SET @y = 0;
+REPEAT
+insert into test1 set b=1;
+SET @x = @x + 1;
+SET @y = @y + 1;
+IF @y >= 1000 THEN
+commit;
+SET @y = 0;
+END IF;
+UNTIL @x >= p1 END REPEAT;
+END|
+DROP PROCEDURE insert_many;
+ALTER TABLE test1 ENGINE=MyISAM;
+DROP TABLE test1;
+SET GLOBAL innodb_file_format=@old_innodb_file_format;
+SET GLOBAL innodb_file_per_table=@old_innodb_file_per_table;
+SET GLOBAL innodb_file_format_check=@old_innodb_file_format_check;

mysql-test/r/merge.result

@@ -1846,56 +1846,6 @@ c1
 DROP TABLE t1, t2, t3;
 CREATE TABLE t1 (id INTEGER, grp TINYINT, id_rev INTEGER);
 SET @rnd_max= 2147483647;
-SET @rnd= RAND();
-SET @id = CAST(@rnd * @rnd_max AS UNSIGNED);
-SET @id_rev= @rnd_max - @id;
-SET @grp= CAST(127.0 * @rnd AS UNSIGNED);
-INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
-SET @rnd= RAND();
-SET @id = CAST(@rnd * @rnd_max AS UNSIGNED);
-SET @id_rev= @rnd_max - @id;
-SET @grp= CAST(127.0 * @rnd AS UNSIGNED);
-INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
-SET @rnd= RAND();
-SET @id = CAST(@rnd * @rnd_max AS UNSIGNED);
-SET @id_rev= @rnd_max - @id;
-SET @grp= CAST(127.0 * @rnd AS UNSIGNED);
-INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
-SET @rnd= RAND();
-SET @id = CAST(@rnd * @rnd_max AS UNSIGNED);
-SET @id_rev= @rnd_max - @id;
-SET @grp= CAST(127.0 * @rnd AS UNSIGNED);
-INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
-SET @rnd= RAND();
-SET @id = CAST(@rnd * @rnd_max AS UNSIGNED);
-SET @id_rev= @rnd_max - @id;
-SET @grp= CAST(127.0 * @rnd AS UNSIGNED);
-INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
-SET @rnd= RAND();
-SET @id = CAST(@rnd * @rnd_max AS UNSIGNED);
-SET @id_rev= @rnd_max - @id;
-SET @grp= CAST(127.0 * @rnd AS UNSIGNED);
-INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
-SET @rnd= RAND();
-SET @id = CAST(@rnd * @rnd_max AS UNSIGNED);
-SET @id_rev= @rnd_max - @id;
-SET @grp= CAST(127.0 * @rnd AS UNSIGNED);
-INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
-SET @rnd= RAND();
-SET @id = CAST(@rnd * @rnd_max AS UNSIGNED);
-SET @id_rev= @rnd_max - @id;
-SET @grp= CAST(127.0 * @rnd AS UNSIGNED);
-INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
-SET @rnd= RAND();
-SET @id = CAST(@rnd * @rnd_max AS UNSIGNED);
-SET @id_rev= @rnd_max - @id;
-SET @grp= CAST(127.0 * @rnd AS UNSIGNED);
-INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
-SET @rnd= RAND();
-SET @id = CAST(@rnd * @rnd_max AS UNSIGNED);
-SET @id_rev= @rnd_max - @id;
-SET @grp= CAST(127.0 * @rnd AS UNSIGNED);
-INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev);
 set @@read_buffer_size=2*1024*1024;
 CREATE TABLE t2 SELECT * FROM t1;
 INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;

mysql-test/r/myisam_debug.result

@@ -12,16 +12,6 @@ CREATE TABLE `t2` (
 KEY (id1), KEY(id)
 ) ENGINE=MyISAM;
 INSERT INTO t2 (id) VALUES (123);
-INSERT INTO t2 (id) SELECT id  FROM t2;
-INSERT INTO t2 (id) SELECT id  FROM t2;
-INSERT INTO t2 (id) SELECT id  FROM t2;
-INSERT INTO t2 (id) SELECT id  FROM t2;
-INSERT INTO t2 (id) SELECT id  FROM t2;
-INSERT INTO t2 (id) SELECT id  FROM t2;
-INSERT INTO t2 (id) SELECT id  FROM t2;
-INSERT INTO t2 (id) SELECT id  FROM t2;
-INSERT INTO t2 (id) SELECT id  FROM t2;
-INSERT INTO t2 (id) SELECT id  FROM t2;
 # Switch to insert Connection
 SET SESSION debug='+d,wait_in_enable_indexes';
 # Send insert data

mysql-test/suite/parts/inc/partition.pre

@@ -152,6 +152,7 @@ ENGINE = MEMORY;
 --echo #     Logging of <max_row> INSERTs into t0_template suppressed
 --disable_query_log
 let $num= `SELECT @max_row`;
+begin;
 while ($num)
 {
   eval INSERT INTO t0_template
@@ -160,6 +161,7 @@ f_charbig = '===$num===';
 
   dec $num;
 }
+commit;
 --enable_query_log
 
 # Auxiliary table used for comparisons of table definitions and file lists

mysql-test/suite/parts/inc/partition_bigint.inc

@@ -32,11 +32,13 @@ delete from t2;
 let $count=$maxrows;
 --echo $maxrows inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values ($count);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t2;
 drop table t2;

mysql-test/suite/parts/inc/partition_binary.inc

@@ -22,13 +22,16 @@ show create table t2;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values (repeat(char(ascii('a')+$letter),$count+54));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t2;
 select hex(a) from t2;
 drop table t2;
@@ -48,13 +51,16 @@ show create table t3;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values (repeat(char(ascii('a')+$letter),$count+54));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select hex(a) from t3;
 drop table t3;
@@ -73,14 +79,16 @@ show create table t4;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values (repeat(char(ascii('a')+$letter),$count+54));
 dec $count;
 inc $letter;
 }
-
+commit;
+--enable_query_log
 select count(*) from t4;
 select hex(a) from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_bit.inc

@@ -74,11 +74,13 @@ show create table t3;
 let $count=255;
 --echo $count inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values ($count);
 dec $count;
 }
+commit;
 --enable_query_log
 select hex(a) from t3 where a=b'01010101';
 delete from t3 where a=b'01010101';
@@ -96,11 +98,13 @@ show create table t4;
 let $count=32;
 --echo $count inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values ($count);
 dec $count;
 }
+commit;
 --enable_query_log
 select hex(a) from t4 where a=b'00000001';
 delete from t4 where a=b'00000001';

mysql-test/suite/parts/inc/partition_char.inc

@@ -21,13 +21,16 @@ show create table t2;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values (repeat(char(ascii('a')+$letter),$count+54));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t2;
 select * from t2;
 drop table t2;
@@ -47,13 +50,16 @@ show create table t3;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values (repeat(char(ascii('a')+$letter),$count+54));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select a from t3;
 drop table t3;
@@ -71,13 +77,16 @@ show create table t4;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values (repeat(char(ascii('a')+$letter),$count+54));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t4;
 select a from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_date.inc

@@ -23,7 +23,8 @@ select * from t2;
 delete from t2;
 let $count=28;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values (19700101+$count-1);
@@ -31,7 +32,8 @@ eval insert into t2 values (19700201+$count-1);
 eval insert into t2 values (19700301+$count-1);
 dec $count;
 }
-#--enable_query_log
+commit;
+--enable_query_log
 select count(*) from t2;
 select * from t2;
 drop table t2;
@@ -47,11 +49,15 @@ partition quarter4 values less than (13)
 show create table t3;
 let $count=12;
 --echo $count inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values (adddate(19700101,interval $count-1 month));
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select * from t3;
 drop table t3;
@@ -67,11 +73,15 @@ partition quarter4 values in (10,11,12)
 show create table t4;
 let $count=12;
 --echo $count inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values (adddate(19700101,interval $count-1 month));
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t4;
 select * from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_datetime.inc

@@ -23,12 +23,15 @@ select * from t2;
 delete from t2;
 let $count=59;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values (19700101000000+$count);
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t2;
 select * from t2;
 drop table t2;
@@ -44,11 +47,15 @@ partition quarter4 values less than (13)
 show create table t3;
 let $count=12;
 --echo $count inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values (adddate(19700101000000,interval $count-1 month));
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select * from t3;
 drop table t3;
@@ -64,11 +71,15 @@ partition quarter4 values in (10,11,12)
 show create table t4;
 let $count=12;
 --echo $count inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values (adddate(19700101000000,interval $count-1 month));
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t4;
 select * from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_decimal.inc

@@ -24,6 +24,7 @@ delete from t2;
 let $count=$maxrows;
 --echo $count*3 inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values ($count);
@@ -31,6 +32,7 @@ eval insert into t2 values ($count+0.333333333);
 eval insert into t2 values ($count+0.755555555);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t2;
 drop table t2;
@@ -53,6 +55,8 @@ partition pa10 values less than (10)
 show create table t3;
 let $count=9;
 --echo $count*3 inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values ($count);
@@ -60,6 +64,7 @@ eval insert into t3 values ($count+0.333333333);
 eval insert into t3 values ($count+0.755555555);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t3;
 drop table t3;
@@ -75,6 +80,8 @@ partition pa10 values in (9,10)
 show create table t4;
 let $count=9;
 --echo $count*3 inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values ($count);
@@ -82,6 +89,7 @@ eval insert into t4 values ($count+0.333333333);
 eval insert into t4 values ($count+0.755555555);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_double.inc

@@ -24,6 +24,7 @@ delete from t2;
 let $count=$maxrows;
 --echo $maxrows*3 inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values ($count);
@@ -31,6 +32,7 @@ eval insert into t2 values ($count+0.33);
 eval insert into t2 values ($count+0.75);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t2;
 drop table t2;
@@ -52,6 +54,8 @@ partition pa10 values less than (10)
 show create table t3;
 let $count=9;
 --echo $count*3 inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values ($count);
@@ -59,6 +63,8 @@ eval insert into t3 values ($count+0.33);
 eval insert into t3 values ($count+0.75);
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select * from t3;
 drop table t3;
@@ -72,6 +78,8 @@ partition pa10 values in (7,8,9,10)
 show create table t4;
 let $count=9;
 --echo $count*3 inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values ($count);
@@ -79,6 +87,8 @@ eval insert into t4 values ($count+0.33);
 eval insert into t4 values ($count+0.75);
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t4;
 select * from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_enum.inc

@@ -26,12 +26,15 @@ partition by key (a) partitions 27;
 show create table t2;
 let $letter=26;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($letter)
 {
 eval insert into t2 values (char(ascii('A')+$letter));
 dec $letter;
 }
+commit;
+--enable_query_log
 insert into t2 values ('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9'),('0');
 select count(*) from t2;
 select * from t2;
@@ -55,12 +58,15 @@ partition pa36 values less than (37)
 show create table t3;
 let $letter=36;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+  begin;
 while ($letter)
 {
 #eval insert into t3 values ($letter);
 dec $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select * from t3;
 drop table t3;

mysql-test/suite/parts/inc/partition_float.inc

@@ -28,6 +28,7 @@ delete from t2;
 let $count=$maxrows;
 --echo $maxrows*3 inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values ($count);
@@ -35,6 +36,7 @@ eval insert into t2 values ($count+0.33);
 eval insert into t2 values ($count+0.75);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t2;
 drop table t2;
@@ -55,6 +57,8 @@ partition pa10 values less than (10)
 show create table t3;
 let $count=9;
 --echo $count*3 inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values ($count);
@@ -62,6 +66,8 @@ eval insert into t3 values ($count+0.33);
 eval insert into t3 values ($count+0.75);
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select * from t3;
 drop table t3;
@@ -75,6 +81,8 @@ partition pa10 values in (7,8,9,10)
 show create table t4;
 let $count=9;
 --echo $count*3 inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values ($count);
@@ -82,6 +90,8 @@ eval insert into t4 values ($count+0.33);
 eval insert into t4 values ($count+0.75);
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t4;
 select * from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_int.inc

@@ -28,11 +28,13 @@ delete from t2;
 let $count=$maxrows;
 --echo $count inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values ($count);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t2;
 drop table t2;

mysql-test/suite/parts/inc/partition_mediumint.inc

@@ -28,11 +28,13 @@ delete from t2;
 let $count=$maxrows;
 --echo $maxrows inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values ($count);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t2;
 drop table t2;

mysql-test/suite/parts/inc/partition_smallint.inc

@@ -28,11 +28,13 @@ delete from t2;
 let $count=$maxrows;
 --echo $count inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values ($count);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t2;
 drop table t2;

mysql-test/suite/parts/inc/partition_time.inc

@@ -23,12 +23,15 @@ select * from t2;
 delete from t2;
 let $count=59;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values (000100+$count);
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t2;
 select * from t2;
 drop table t2;
@@ -44,11 +47,15 @@ partition quarter4 values less than (61)
 show create table t3;
 let $count=59;
 --echo $count inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values (100000+$count);
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select * from t3;
 drop table t3;
@@ -64,11 +71,15 @@ partition quarter4 values in (46,47,48,49,50,51,52,53,54,55,56,57,58,59,60)
 show create table t4;
 let $count=59;
 --echo $count inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values (100000+$count);
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t4;
 select * from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_timestamp.inc

@@ -23,12 +23,15 @@ select * from t2;
 delete from t2;
 let $count=59;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values (19710101000000+$count);
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t2;
 select * from t2;
 drop table t2;
@@ -44,11 +47,15 @@ partition quarter4 values less than (13)
 show create table t3;
 let $count=12;
 --echo $count inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values (date_add('1970-01-01 00:00:00',interval $count-1 month));
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select * from t3;
 drop table t3;
@@ -64,11 +71,15 @@ partition quarter4 values in (10,11,12)
 show create table t4;
 let $count=12;
 --echo $count inserts;
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values (date_add('1970-01-01 00:00:00',interval $count-1 month));
 dec $count;
 }
+commit;
+--enable_query_log
 select count(*) from t4;
 select * from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_tinyint.inc

@@ -28,11 +28,13 @@ delete from t2;
 let $count=255;
 --echo 255 inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values ($count);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t2;
 drop table t2;

mysql-test/suite/parts/inc/partition_varbinary.inc

@@ -21,13 +21,16 @@ show create table t2;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values (repeat(char(ascii('a')+$letter),$count*$count));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t2;
 select * from t2;
 drop table t2;
@@ -47,13 +50,16 @@ show create table t3;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values (repeat(char(ascii('a')+$letter),$count+54));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select hex(a) from t3;
 drop table t3;
@@ -71,13 +77,16 @@ show create table t4;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values (repeat(char(ascii('a')+$letter),$count+54));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t4;
 select hex(a) from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_varchar.inc

@@ -21,13 +21,16 @@ show create table t2;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values (repeat(char(ascii('a')+$letter),$count*$count));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t2;
 select * from t2;
 drop table t2;
@@ -46,13 +49,16 @@ show create table t3;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t3 values (repeat(char(ascii('a')+$letter),$count+54));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t3;
 select * from t3;
 drop table t3;
@@ -70,13 +76,16 @@ show create table t4;
 let $count=26;
 let $letter=0;
 --echo $count inserts;
-#--disable_query_log
+--disable_query_log
+begin;
 while ($count)
 {
 eval insert into t4 values (repeat(char(ascii('a')+$letter),$count+54));
 dec $count;
 inc $letter;
 }
+commit;
+--enable_query_log
 select count(*) from t4;
 select * from t4;
 drop table t4;

mysql-test/suite/parts/inc/partition_year.inc

@@ -24,11 +24,13 @@ delete from t2;
 let $count=255;
 --echo $count inserts;
 --disable_query_log
+begin;
 while ($count)
 {
 eval insert into t2 values (1901+$count);
 dec $count;
 }
+commit;
 --enable_query_log
 select count(*) from t2;
 select * from t2;

mysql-test/suite/parts/t/part_supported_sql_func_innodb.test

@@ -25,6 +25,8 @@
 let $debug= 0;
 let $do_long_tests= 1;
 
+#
+--include/big_test.inc
 # The server must support partitioning.
 --source include/have_partition.inc
 

mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test

@@ -43,6 +43,8 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# Slow running test
+--include/big_test.inc
 # This test relies on connecting externally from mysqltest, doesn't
 # work with embedded.
 --source include/not_embedded.inc

mysql-test/suite/parts/t/partition_alter4_myisam.test

@@ -40,6 +40,8 @@ SET @max_row = 20;
 let $more_trigger_tests= 0;
 let $more_pk_ui_tests= 0;
 
+# Slow running test
+--include/big_test.inc
 # This test relies on connecting externally from mysqltest, doesn't
 # work with embedded.
 --source include/not_embedded.inc

mysql-test/t/almost_full.test

@@ -11,11 +11,13 @@ CREATE TABLE t1 (a int auto_increment primary key not null, b longtext) ENGINE=M
 
 --disable_query_log
 let $1= 303;
+begin;
 while ($1)
 {
   INSERT INTO t1 SET b=repeat('a',200);
   dec $1;
 }
+commit;
 --enable_query_log
 
 DELETE FROM t1 WHERE a=1 or a=5;

mysql-test/t/alter_table.test

@@ -121,11 +121,15 @@ alter table t1 disable keys;
 show keys from t1;
 #let $1=10000;
 let $1=10;
+--disable_query_log
+begin;
 while ($1)
 {
  eval insert into t1 values($1,RAND()*1000,RAND()*1000,RAND());
  dec $1;
 }
+commit;
+--enable_query_log
 alter table t1 enable keys;
 show keys from t1;
 drop table t1;
@@ -144,11 +148,15 @@ drop table t1;
 
 create table t1 (a int, b int);
 let $1=100;
+--disable_query_log
+begin;
 while ($1)
 {
  eval insert into t1 values(1,$1), (2,$1), (3, $1);
  dec $1;
 }
+commit;
+--enable_query_log
 alter table t1 add unique (a,b), add key (b);
 show keys from t1;
 analyze table t1;
@@ -966,12 +974,14 @@ DROP TABLE t1;
 create table t1(f1 int not null, f2 int not null, key  (f1), key (f2));
 let $count= 50;
 --disable_query_log
+begin;
 while ($count)
 {
   EVAL insert into t1 values (1,1),(1,1),(1,1),(1,1),(1,1);
   EVAL insert into t1 values (2,2),(2,2),(2,2),(2,2),(2,2);
   dec $count ;
 }
+commit;
 --enable_query_log
 
 select index_length into @unpaked_keys_size from

mysql-test/t/archive.test

@@ -1576,11 +1576,13 @@ CREATE TABLE t1(a VARCHAR(510)) ENGINE = ARCHIVE;
 
 let $bug31036=41;
 --disable_query_log
+begin;
 while($bug31036)
 {
   INSERT INTO t1(a) VALUES (REPEAT('a', 510));
   dec $bug31036;
 }
+commit;
 --enable_query_log
 INSERT INTO t1(a) VALUES ('');
 

mysql-test/t/bench_count_distinct.test

@@ -7,14 +7,16 @@ drop table if exists t1;
 --enable_warnings
 create table t1(n int not null, key(n)) delay_key_write = 1;
 let $1=100;
-disable_query_log;
+--disable_query_log
+begin;
 while ($1)
 {
  eval insert into t1 values($1);
  eval insert into t1 values($1);
  dec $1;
 }
-enable_query_log;
+commit;
+--enable_query_log
 select count(distinct n) from t1;
 explain extended select count(distinct n) from t1;
 drop table t1;

mysql-test/t/change_user.test

@@ -57,13 +57,13 @@ FLUSH STATUS;
 --disable_query_log
 
 let $i = 100;
-
+begin;
 while ($i)
 {
   dec $i;
-
   SELECT 1;
 }
+commit;
 
 --enable_query_log
 --enable_result_log

mysql-test/t/check.test

@@ -12,13 +12,15 @@ drop view if exists v1;
 # Add a lot of keys to slow down check
 create table t1(n int not null, key(n), key(n), key(n), key(n));
 let $1=10000;
-disable_query_log;
+--disable_query_log
+begin;
 while ($1)
 {
  eval insert into t1 values ($1);
  dec $1;
 }
-enable_query_log;
+commit;
+--enable_query_log
 send check table t1 extended;
 connection con2;
 insert into t1 values (200000);

mysql-test/t/count_distinct2.test

@@ -51,13 +51,15 @@ drop table t1;
 # test the conversion from tree to MyISAM
 create table t1 (n int default NULL);
 let $1=5000;
-disable_query_log;
+--disable_query_log
+begin;
 while ($1)
 {
  eval insert into t1 values($1);
  dec $1;
 }
-enable_query_log;
+commit;
+--enable_query_log
 
 flush status;
 select count(distinct n) from t1;
@@ -67,13 +69,15 @@ drop table t1;
 # Test use of MyISAM tmp tables
 create table t1 (s text);
 let $1=5000;
-disable_query_log;
+--disable_query_log
+begin;
 while ($1)
 {
  eval insert into t1 values('$1');
  dec $1;
 }
-enable_query_log;
+commit;
+--enable_query_log
 flush status;
 select count(distinct s) from t1;
 show status like 'Created_tmp_disk_tables';

mysql-test/t/count_distinct3.test

@@ -14,6 +14,7 @@ CREATE TABLE t1 (id INTEGER, grp TINYINT, id_rev INTEGER);
 --disable_query_log
 SET @rnd_max= 2147483647;
 let $1 = 1000;
+begin;
 while ($1)
 {
   SET @rnd= RAND();
@@ -23,7 +24,7 @@ while ($1)
   INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev); 
   dec $1;
 }
-
+commit;
 # We increase the size of t1 here.
 SET @orig_myisam_sort_buffer_size = @@session.myisam_sort_buffer_size;
 SET session myisam_sort_buffer_size=20000000;

mysql-test/t/ctype_euckr.test

@@ -77,11 +77,13 @@ DROP TABLE t1;
 CREATE TABLE t1 (a binary(1), key(a));
 --disable_query_log
 let $1=255;
+begin;
 while($1)
 {
   eval INSERT INTO t1 VALUES (unhex(hex($1)));
   dec $1;
 }
+commit;
 --enable_query_log
 
 CREATE TABLE t2 (s VARCHAR(4), a VARCHAR(1) CHARACTER SET euckr);

mysql-test/t/derived.test

@@ -45,14 +45,16 @@ select * from (select * from t1 where t1.a=(select t2.a from t2 where t2.a=t1.a)
 explain select * from (select t1.*, t2.a as t2a from t1,t2 where t1.a=t2.a) t1;
 drop table t1, t2;
 create table t1(a int not null, t char(8), index(a));
-disable_query_log;
+--disable_query_log
+begin;
 let $1 = 10000;
 while ($1)
  {
   eval insert into t1 values ($1,'$1'); 
   dec $1;
  }
-enable_query_log;
+commit;
+--enable_query_log
 SELECT * FROM (SELECT * FROM t1) as b ORDER BY a  ASC LIMIT 0,20;
 explain select count(*) from t1 as tt1, (select * from t1) as tt2;
 drop table t1;

mysql-test/t/events_time_zone.test

@@ -118,6 +118,7 @@ INSERT INTO mysql.time_zone_transition_type
 let $transition_unix_time= `SELECT @unix_time`;
 let $count= 30;
 --disable_query_log
+begin;
 while ($count)
 {
   eval INSERT INTO mysql.time_zone_transition
@@ -126,6 +127,7 @@ while ($count)
   let $transition_unix_time= `SELECT $transition_unix_time + @step3`;
   dec $count;
 }
+commit;
 --enable_query_log
 let $tz_name = `SELECT CONCAT('b16420_a',UNIX_TIMESTAMP())`;
 --replace_result $tz_name <TZ_NAME_1>

mysql-test/t/fulltext2.test

@@ -18,6 +18,7 @@ CREATE TABLE t1 (
 
 # two-level entry, second-level tree with depth 2
 --disable_query_log
+begin;
 let $1=260;
 while ($1)
 {
@@ -40,6 +41,7 @@ while ($1)
   eval insert t1 (a) values ('aaayyy');
   dec $1;
 }
+commit;
 --enable_query_log
 
 # converting to two-level
@@ -113,6 +115,7 @@ CREATE TABLE t1 (
 # two-level entry, second-level tree with depth 2
 --disable_query_log
 let $1=260;
+begin;
 while ($1)
 {
   eval insert t1 (a) values ('aaaxxx');
@@ -130,6 +133,7 @@ while ($1)
   eval insert t1 (a) values ('aaayyy');
   dec $1;
 }
+commit;
 --enable_query_log
 
 select count(*) from t1 where match a against ('aaaxxx');

mysql-test/t/func_misc.test

@@ -213,11 +213,15 @@ start_ts DATETIME, end_ts DATETIME,
 start_cached INTEGER, end_cached INTEGER);
 CREATE TABLE t1 (f1 BIGINT);
 let $num = `SELECT @row_count`;
+--disable_query_log
+begin;
 while ($num)
 {
    INSERT INTO t1 VALUES (1);
    dec $num;
 }
+commit;
+--enable_query_log
 
 let $loops = 4;
 let $num = $loops;

mysql-test/t/gis-rtree.test

@@ -17,12 +17,16 @@ SHOW CREATE TABLE t1;
 
 let $1=150;
 let $2=150;
+--disable_query_log
+begin;
 while ($1)
 {
   eval INSERT INTO t1 (g) VALUES (GeomFromText('LineString($1 $1, $2 $2)'));
   dec $1;
   inc $2;
 }
+commit;
+--enable_query_log
 
 SELECT count(*) FROM t1;
 EXPLAIN SELECT fid, AsText(g) FROM t1 WHERE Within(g, GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))'));
@@ -35,6 +39,8 @@ CREATE TABLE t2 (
   g GEOMETRY NOT NULL
 ) ENGINE=MyISAM;
 
+--disable_query_log
+begin;
 let $1=10;
 while ($1)
 {
@@ -46,6 +52,8 @@ while ($1)
   }
   dec $1;
 }
+commit;
+--enable_query_log
 
 ALTER TABLE t2 ADD SPATIAL KEY(g);
 SHOW CREATE TABLE t2;
@@ -55,6 +63,8 @@ EXPLAIN SELECT fid, AsText(g) FROM t2 WHERE Within(g,
 SELECT fid, AsText(g) FROM t2 WHERE Within(g, 
   GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))'));
 
+--disable_query_log
+begin;
 let $1=10;
 while ($1)
 {
@@ -67,6 +77,8 @@ while ($1)
   }
   dec $1;
 }
+commit;
+--enable_query_log
 
 DROP TABLE t2;
 

mysql-test/t/heap.test

@@ -234,7 +234,8 @@ drop table t1,t2,t3;
 #
 create table t1 (v varchar(10), c char(10), t varchar(50), key(v), key(c), key(t(10)));
 show create table t1;
-disable_query_log;
+--disable_query_log
+begin;
 let $1=10;
 while ($1)
 {
@@ -248,7 +249,9 @@ while ($1)
   }
   dec $1;
 }
-enable_query_log;
+commit;
+--enable_query_log
+
 select count(*) from t1;
 insert into t1 values(concat('a',char(1)),concat('a',char(1)),concat('a',char(1)));
 select count(*) from t1 where v='a';
@@ -318,7 +321,8 @@ drop table t1;
 
 create table t1 (v varchar(10), c char(10), t varchar(50), key using btree (v), key using btree (c), key using btree (t(10)));
 show create table t1;
-disable_query_log;
+--disable_query_log
+begin;
 let $1=10;
 while ($1)
 {
@@ -332,7 +336,8 @@ while ($1)
   }
   dec $1;
 }
-enable_query_log;
+commit;
+--enable_query_log
 select count(*) from t1;
 insert into t1 values(concat('a',char(1)),concat('a',char(1)),concat('a',char(1)));
 select count(*) from t1 where v='a';

mysql-test/t/innodb_xtradb_bug317074.test

---source include/big_test.inc
 --source include/have_innodb.inc
 
 SET @old_innodb_file_format=@@innodb_file_format;
@@ -7,16 +6,16 @@ SET @old_innodb_file_format_check=@@innodb_file_format_check;
 SET GLOBAL innodb_file_format='Barracuda';
 SET GLOBAL innodb_file_per_table=ON;
 
--- disable_query_log
--- disable_result_log
-
+--disable_warnings
 DROP TABLE IF EXISTS `test1`;
+--enable_warnings
 CREATE TABLE IF NOT EXISTS `test1` (
  `a` int primary key auto_increment,
  `b` int default 0,
  `c` char(100) default 'testtest'
 ) ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 
+set autocommit=0;
 delimiter |;
 CREATE PROCEDURE insert_many(p1 int)
 BEGIN
@@ -26,14 +25,18 @@ REPEAT
   insert into test1 set b=1;
   SET @x = @x + 1;
   SET @y = @y + 1;
-  IF @y >= 100 THEN
+  IF @y >= 1000 THEN
     commit;
     SET @y = 0;
   END IF;
 UNTIL @x >= p1 END REPEAT;
 END|
 delimiter ;|
+--disable_query_log
+--disable_result_log
 call insert_many(100000);
+--enable_query_log
+--enable_result_log
 DROP PROCEDURE insert_many;
 
 # The bug is hangup at the following statement

mysql-test/t/insert.test

@@ -151,7 +151,8 @@ drop table t1;
 create table t1(id1 int not null auto_increment primary key, t char(12));
 create table t2(id2 int not null, t char(12));
 create table t3(id3 int not null, t char(12), index(id3));
-disable_query_log;
+--disable_query_log
+begin;
 let $1 = 100;
 while ($1)
  {
@@ -170,7 +171,9 @@ while ($1)
    }
   dec $1;
  }
-enable_query_log;
+commit;
+--enable_query_log
+
 select count(*) from t2;
 insert into  t2 select t1.* from t1, t2 t, t3 where  t1.id1 = t.id2 and t.id2 = t3.id3;
 select count(*) from t2;

mysql-test/t/kill.test

@@ -67,12 +67,14 @@ connection conn1;
 
 -- disable_result_log
 -- disable_query_log
+begin;
 let $1 = 4096;
 while ($1)
 {
   eval insert into t1 values ($1);
   dec $1;
 }
+commit;
 -- enable_query_log
 -- enable_result_log
 
@@ -265,6 +267,8 @@ connection con1;
 let $ID= `select connection_id()`;
 let $tab_count= 40;
 
+--disable_query_log
+begin;
 let $i= $tab_count;
 while ($i)
 {
@@ -272,6 +276,8 @@ while ($i)
   eval INSERT INTO t$i VALUES (1),(2),(3),(4),(5),(6),(7);
   dec $i ;
 }
+commit;
+--enable_query_log
 set session optimizer_search_depth=0;
 
 let $i=$tab_count;

mysql-test/t/merge.test

@@ -1274,6 +1274,8 @@ DROP TABLE t1, t2, t3;
 CREATE TABLE t1 (id INTEGER, grp TINYINT, id_rev INTEGER);
 SET @rnd_max= 2147483647;
 let $1 = 10;
+--disable_query_log
+begin;
 while ($1)
 {
   SET @rnd= RAND();
@@ -1283,6 +1285,8 @@ while ($1)
   INSERT INTO t1 (id, grp, id_rev) VALUES (@id, @grp, @id_rev); 
   dec $1;
 }
+commit;
+--enable_query_log
 set @@read_buffer_size=2*1024*1024;
 CREATE TABLE t2 SELECT * FROM t1;
 INSERT INTO t1 (id, grp, id_rev) SELECT id, grp, id_rev FROM t2;

mysql-test/t/multi_update.test

@@ -20,7 +20,8 @@ delete from mysql.user where user=_binary'mysqltest_1';
 create table t1(id1 int not null auto_increment primary key, t char(12));
 create table t2(id2 int not null, t char(12));
 create table t3(id3 int not null, t char(12), index(id3));
-disable_query_log;
+--disable_query_log
+begin;
 let $1 = 100;
 while ($1)
  {
@@ -39,7 +40,8 @@ while ($1)
    }
   dec $1;
  }
-enable_query_log;
+commit;
+--enable_query_log
 
 select count(*) from t1 where id1 > 95;
 select count(*) from t2 where id2 > 95;
@@ -75,7 +77,8 @@ drop table t1,t2,t3;
 
 create table t1(id1 int not null  primary key, t varchar(100)) pack_keys = 1;
 create table t2(id2 int not null, t varchar(100), index(id2)) pack_keys = 1;
-disable_query_log;
+--disable_query_log
+begin;
 let $1 = 1000;
 while ($1)
  {
@@ -88,7 +91,8 @@ while ($1)
    }
   dec $1;
  }
-enable_query_log;
+commit;
+--enable_query_log
 delete t1  from t1,t2 where t1.id1 = t2.id2 and t1.id1 > 500;
 drop table t1,t2;
 

mysql-test/t/multi_update2.test

@@ -48,13 +48,14 @@ CREATE TABLE t1 ( a INT NOT NULL, b INT NOT NULL) ;
 INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4);
 let $1=19;
 set @d=4;
+begin;
 while ($1)
 {
   eval INSERT INTO t1 SELECT a+@d,b+@d FROM t1;
   eval SET @d=@d*2;
   dec $1;
 }
-
+commit;
 --enable_query_log
 ALTER TABLE t1 ADD INDEX i1(a);
 DELETE FROM t1 WHERE a > 2000000;

mysql-test/t/myisam.test

@@ -33,7 +33,8 @@ drop table t1;
 create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a));
 
 let $1=100;
-disable_query_log;
+--disable_query_log
+begin;
 --disable_warnings
 SET SQL_WARNINGS=0;
 while ($1)
@@ -41,9 +42,10 @@ while ($1)
   eval insert into t1 (b) values(repeat(char(65+$1),65550-$1));
   dec $1;
 }
+commit;
 SET SQL_WARNINGS=1;
 --enable_warnings
-enable_query_log;
+--enable_query_log
 check table t1;
 repair table t1;
 delete from t1 where (a & 1);
@@ -380,14 +382,16 @@ check table t1;
 # check updating with keys
 #
 
-disable_query_log;
+--disable_query_log
+begin;
 let $1 = 100;
 while ($1)
 {
   eval insert into t1 (b) values (repeat(char(($1 & 32)+65), $1));
   dec $1;
 }
-enable_query_log;
+commit;
+--enable_query_log
 update t1 set b=repeat(left(b,1),255) where a between 1 and 5;
 update t1 set b=repeat(left(b,1),10) where a between 32 and 43;
 update t1 set b=repeat(left(b,1),2) where a between 64 and 66;
@@ -551,11 +555,13 @@ create table t2 (a int);
 let $i=1000;
 set @@rand_seed1=31415926,@@rand_seed2=2718281828;
 --disable_query_log
+begin;
 while ($i)
 {
   dec $i;
   insert t2 values (rand()*100000);
 }
+commit;
 --enable_query_log
 insert t1 select * from t2;
 show keys from t1;
@@ -1360,11 +1366,13 @@ CREATE TABLE t1 (
 --disable_query_log
 let $count= 100;
 --echo # Insert $count rows. Query log disabled.
+begin;
 while ($count)
 {
   INSERT INTO t1 VALUES ('a', 'b');
   dec $count;
 }
+commit;
 --enable_query_log
 #
 # Change most of the rows into long character values with > 127 characters.
@@ -1444,11 +1452,13 @@ CREATE TABLE t1 (
 --disable_query_log
 let $count= 100;
 --echo # Insert $count rows. Query log disabled.
+begin;
 while ($count)
 {
   INSERT INTO t1 VALUES ('a', 'b');
   dec $count;
 }
+commit;
 --enable_query_log
 #
 # Change most of the rows into long character values with > 42 characters.

mysql-test/t/myisam_debug.test

@@ -24,11 +24,15 @@ CREATE TABLE `t2` (
 INSERT INTO t2 (id) VALUES (123);
 
 let $i = 10; 
+--disable_query_log
+begin;
 while ($i)
 {
   INSERT INTO t2 (id) SELECT id  FROM t2; 
   dec $i; 
 }
+commit;
+--enable_query_log
 
 --echo # Switch to insert Connection
 CONNECTION insertConn;

mysql-test/t/myisampack.test

@@ -69,11 +69,13 @@ CREATE TABLE  t1(f1 VARCHAR(200), f2 TEXT);
 INSERT INTO  t1 VALUES ('foo', 'foo1'), ('bar', 'bar1');
 let $i=9;
 --disable_query_log
+begin;
 while ($i)
 {
  INSERT INTO t1 SELECT * FROM t1; 
  dec $i; 
 }
+commit;
 --enable_query_log
 FLUSH TABLE t1; 
 --echo # Compress the table using MYISAMPACK tool

mysql-test/t/order_by.test

@@ -374,14 +374,16 @@ DROP TABLE t1;
 #
 
 create table t1(id int not null auto_increment primary key, t char(12));
-disable_query_log;
+--disable_query_log
+begin;
 let $1 = 1000;
 while ($1)
  {
   eval insert into t1(t) values ('$1'); 
   dec $1;
  }
-enable_query_log;
+commit;
+--enable_query_log
 explain select id,t from t1 order by id;
 explain select id,t from t1 force index (primary) order by id;
 drop table t1;

mysql-test/t/order_fill_sortbuf.test

@@ -12,13 +12,15 @@ CREATE TABLE `t1` (
   `id2` int(11) NOT NULL default '0',
   `id3` int(11) NOT NULL default '0');
 let $1=4000;
-disable_query_log;
+--disable_query_log
+begin;
 while ($1)
  {
    eval insert into t1 (id,id2,id3) values ($1,$1,$1);
    dec $1;
  }
-enable_query_log;
+commit;
+--enable_query_log
 create table t2 select id2 from t1 order by id3;
 select count(*) from t2;
 drop table t1,t2;

mysql-test/t/partition.test

@@ -1680,6 +1680,7 @@ create table t1
 
 insert into t1 values (null,null);
 --disable_query_log
+begin;
 let $cnt= 1000;
 while ($cnt)
 {
@@ -1687,6 +1688,7 @@ while ($cnt)
   update t1 set s2 = 2;
   dec $cnt;
 }
+commit;
 --enable_query_log
 
 drop table t1;
@@ -1804,11 +1806,13 @@ CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT,
                     PARTITION pa11 values less than MAXVALUE);
 --disable_query_log
 let $n= 15;
+begin;
 while ($n)
 {
   insert into t1 (user) values ('mysql');
   dec $n;
 }
+commit;
 --enable_query_log
 show create table t1;
 drop table t1;

mysql-test/t/partition_archive.test

@@ -94,11 +94,13 @@ CREATE TABLE t1(id MEDIUMINT NOT NULL AUTO_INCREMENT,
 
 --disable_query_log
 let $n= 100;
+begin;
 while ($n)
 {
   insert into t1 (f1) values (repeat('a',25));
   dec $n;
 }
+commit;
 --enable_query_log
 
 show create table t1;

mysql-test/t/select_found.test

@@ -54,7 +54,8 @@ CREATE TABLE t2 (
   UNIQUE KEY e_n (email,name)
 );
 
-disable_query_log;
+--disable_query_log
+begin;
 let $1=200;
 let $2=0;
 while ($1) 
@@ -63,7 +64,8 @@ while ($1)
   eval INSERT INTO t2 VALUES ($2,'name$2','email$2');
   dec $1;
 }
-enable_query_log;
+commit;
+--enable_query_log
 
 EXPLAIN SELECT SQL_CALC_FOUND_ROWS DISTINCT email FROM t2 LEFT JOIN t1  ON kid = t2.id WHERE t1.id IS NULL LIMIT 10;
 SELECT SQL_CALC_FOUND_ROWS DISTINCT email FROM t2 LEFT JOIN t1  ON kid = t2.id WHERE t1.id IS NULL LIMIT 10;

mysql-test/t/sp-big.test

@@ -43,11 +43,13 @@ create table t2 like t1;
 let $1=8;
 --disable_query_log
 --disable_result_log
+begin;
 while ($1)
 {
   eval insert into t1 select * from t1;
   dec $1;
 }
+commit;
 --enable_result_log
 --enable_query_log
 select count(*) from t1;

mysql-test/t/subselect.test

@@ -811,7 +811,8 @@ create table t1 (a int, b int, index a (a,b));
 create table t2 (a int, index a (a));
 create table t3 (a int, b int, index a (a));
 insert into t1 values (1,10), (2,20), (3,30), (4,40);
-disable_query_log;
+--disable_query_log
+begin;
 # making table large enough
 let $1 = 10000;
 while ($1)
@@ -819,7 +820,8 @@ while ($1)
   eval insert into t1 values (rand()*100000+200,rand()*100000);
   dec $1;
  }
-enable_query_log;
+commit;
+--enable_query_log
 insert into t2 values (2), (3), (4), (5);
 insert into t3 values (10,3), (20,4), (30,5);
 select * from t2 where t2.a in (select a from t1);
@@ -2607,7 +2609,8 @@ CREATE TABLE t1 (a int, b int auto_increment, PRIMARY KEY (b));
 CREATE TABLE t2 (x int auto_increment, y int, z int,
                  PRIMARY KEY (x), FOREIGN KEY (y) REFERENCES t1 (b));
 
-disable_query_log;
+--disable_query_log
+begin;
 let $1=3000;
 while ($1)
 {
@@ -2621,7 +2624,8 @@ while ($1)
   }
   dec $1;
 }
-enable_query_log;
+commit;
+--enable_query_log
 
 SET SESSION sort_buffer_size = 32 * 1024;
 SELECT SQL_NO_CACHE COUNT(*)
@@ -3222,11 +3226,13 @@ insert into t1 values(1,1),(2,2), (3, 3);
 let $i=10000;
 --disable_query_log
 --disable_warnings
+begin;
 while ($i)
 {
   eval insert into t2 values (-1 , $i/5000 + 1, '$i');
   dec $i;
 }
+commit;
 --enable_warnings
 --enable_query_log
 set session sort_buffer_size= 33*1024;

mysql-test/t/warnings.test

@@ -82,13 +82,15 @@ drop table t1, t2;
 
 create table t1(a char(10));
 let $1=50;
-disable_query_log;
+--disable_query_log
+begin;
 while ($1)
 {
   eval insert into t1 values('mysql ab');
   dec $1;
 }
-enable_query_log;
+commit;
+--enable_query_log
 alter table t1 add b char;
 set max_error_count=10;
 update t1 set b=a;