A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system
mysql-test/r/log_state.result: Update results (Bug#28830) mysql-test/t/log_state.test: A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system - make the test more deterministic.
This commit is contained in:
parent
dea279ac8a
commit
6930ac5406
@ -37,14 +37,14 @@ set session long_query_time=1;
|
|||||||
select sleep(2);
|
select sleep(2);
|
||||||
sleep(2)
|
sleep(2)
|
||||||
0
|
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
|
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 global slow_query_log= ON;
|
||||||
set session long_query_time=1;
|
set session long_query_time=1;
|
||||||
select sleep(2);
|
select sleep(2);
|
||||||
sleep(2)
|
sleep(2)
|
||||||
0
|
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
|
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)
|
TIMESTAMP USER_HOST QUERY_TIME 00:00:00 1 0 test 0 0 1 select sleep(2)
|
||||||
show global variables
|
show global variables
|
||||||
|
@ -28,7 +28,7 @@ connection con1;
|
|||||||
set session long_query_time=1;
|
set session long_query_time=1;
|
||||||
select sleep(2);
|
select sleep(2);
|
||||||
--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
|
--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;
|
connection default;
|
||||||
|
|
||||||
set global slow_query_log= ON;
|
set global slow_query_log= ON;
|
||||||
@ -36,7 +36,7 @@ connection con1;
|
|||||||
set session long_query_time=1;
|
set session long_query_time=1;
|
||||||
select sleep(2);
|
select sleep(2);
|
||||||
--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
|
--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;
|
connection default;
|
||||||
show global variables
|
show global variables
|
||||||
where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
|
where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
|
||||||
|
Loading…
x
Reference in New Issue
Block a user