bzr commit into mysql-5.1 branch (patrick.crews:2744) Bug#37798

[Patrick Crews]

#At file:///Users/pcrews/usr/local/bin/data1/work/log_tables/mysql-5.1-bugteam/

 2744 Patrick Crews	2008-09-20
      Bug#37798 main.log_tables fails randomly on powermacg5 and windows
      
      Found that long_query_time was left set to 1 at the end of a subtest.
      Added a cleanup line to reset to default (10s)
      Cannot definitively say that this will work on a busy machine, but I expect this
will correct the random failures.
      Re-recorded .result file to account for cleanup SET statement.
modified:
  mysql-test/r/log_tables.result
  mysql-test/t/log_tables.test

=== modified file 'mysql-test/r/log_tables.result'
--- a/mysql-test/r/log_tables.result	2008-02-29 13:56:50 +0000
+++ b/mysql-test/r/log_tables.result	2008-09-20 08:25:40 +0000
@@ -136,6 +136,7 @@ sleep(2)
 select * from mysql.slow_log;
 start_time	user_host	query_time	lock_time	rows_sent	rows_examined	db	last_insert_id	insert_id	server_id	sql_text
 TIMESTAMP	USER_HOST	QUERY_TIME	00:00:00	1	0	mysql	0	0	1	select sleep(2)
+set session long_query_time= default;
 alter table mysql.general_log engine=myisam;
 ERROR HY000: You cannot 'ALTER' a log table if logging is enabled
 alter table mysql.slow_log engine=myisam;
@@ -213,6 +214,7 @@ TIMESTAMP	USER_HOST	THREAD_ID	1	Query	tr
 TIMESTAMP	USER_HOST	THREAD_ID	1	Query	set session long_query_time=1
 TIMESTAMP	USER_HOST	THREAD_ID	1	Query	select sleep(2)
 TIMESTAMP	USER_HOST	THREAD_ID	1	Query	select * from mysql.slow_log
+TIMESTAMP	USER_HOST	THREAD_ID	1	Query	set session long_query_time= default
 TIMESTAMP	USER_HOST	THREAD_ID	1	Query	alter table mysql.general_log engine=myisam
 TIMESTAMP	USER_HOST	THREAD_ID	1	Query	alter table mysql.slow_log engine=myisam
 TIMESTAMP	USER_HOST	THREAD_ID	1	Query	drop table mysql.general_log

=== modified file 'mysql-test/t/log_tables.test'
--- a/mysql-test/t/log_tables.test	2008-02-29 13:56:50 +0000
+++ b/mysql-test/t/log_tables.test	2008-09-20 08:25:40 +0000
@@ -161,6 +161,7 @@ set session long_query_time=1;
 select sleep(2);
 --replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
 select * from mysql.slow_log;
+set session long_query_time= default;
 
 #
 # Bug #18559 log tables cannot change engine, and gets deadlocked when