bk commit into 5.1 tree (kostja:1.2562) BUG#28830

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-08 15:49:19+04:00, kostja@bodhi.(none) +2 -0
  A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system

  mysql-test/r/log_state.result@stripped, 2007-08-08 15:49:17+04:00, kostja@bodhi.(none) +2 -2
    Update results (Bug#28830)

  mysql-test/t/log_state.test@stripped, 2007-08-08 15:49:17+04:00, kostja@bodhi.(none) +2 -2
    A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due 
    to loaded system - make the test more deterministic.

diff -Nrup a/mysql-test/r/log_state.result b/mysql-test/r/log_state.result
--- a/mysql-test/r/log_state.result	2007-07-27 22:20:27 +04:00
+++ b/mysql-test/r/log_state.result	2007-08-08 15:49:17 +04:00
@@ -37,14 +37,14 @@ set session long_query_time=1;
 select sleep(2);
 sleep(2)
 0
-select * from mysql.slow_log;
+select * from mysql.slow_log where sql_text NOT LIKE '%slow_log%';
 start_time	user_host	query_time	lock_time	rows_sent	rows_examined	db	last_insert_id	insert_id	server_id	sql_text
 set global slow_query_log= ON;
 set session long_query_time=1;
 select sleep(2);
 sleep(2)
 0
-select * from mysql.slow_log;
+select * from mysql.slow_log where sql_text NOT LIKE '%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	test	0	0	1	select sleep(2)
 show global variables
diff -Nrup a/mysql-test/t/log_state.test b/mysql-test/t/log_state.test
--- a/mysql-test/t/log_state.test	2007-07-27 07:45:32 +04:00
+++ b/mysql-test/t/log_state.test	2007-08-08 15:49:17 +04:00
@@ -28,7 +28,7 @@ connection con1;
 set session long_query_time=1;
 select sleep(2);
 --replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
-select * from mysql.slow_log;
+select * from mysql.slow_log where sql_text NOT LIKE '%slow_log%';
 connection default;
 
 set global slow_query_log= ON;
@@ -36,7 +36,7 @@ connection con1;
 set session long_query_time=1;
 select sleep(2);
 --replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
-select * from mysql.slow_log;
+select * from mysql.slow_log where sql_text NOT LIKE '%slow_log%';
 connection default;
 show global variables
 where Variable_name = 'log' or Variable_name = 'log_slow_queries' or