Commit b27a0956 authored by Kristian Nielsen's avatar Kristian Nielsen

Attempt to fix a rare random test error in main.information_schema.

Add missing REAP to the test.

A later test failed with strange incorrect values for COM_SELECT
in information_schema.global_status. Since global_status is updated
at the end of session activity, it seems appropriate to ensure that
all background connections have completed before accessing it.

(I checked that the original bug still triggers the test case after
the modification with REAP).
parent 4c07b93b
...@@ -1554,7 +1554,9 @@ show open tables where f1()=0; ...@@ -1554,7 +1554,9 @@ show open tables where f1()=0;
drop table t1; drop table t1;
drop function f1; drop function f1;
select * from information_schema.tables where 1=sleep(100000); select * from information_schema.tables where 1=sleep(100000);
Got one of the listed errors
select * from information_schema.columns where 1=sleep(100000); select * from information_schema.columns where 1=sleep(100000);
Got one of the listed errors
explain select count(*) from information_schema.tables; explain select count(*) from information_schema.tables;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE tables ALL NULL NULL NULL NULL NULL Skip_open_table; Scanned all databases 1 SIMPLE tables ALL NULL NULL NULL NULL NULL Skip_open_table; Scanned all databases
......
...@@ -1298,12 +1298,16 @@ info='select * from information_schema.tables where 1=sleep(100000)'; ...@@ -1298,12 +1298,16 @@ info='select * from information_schema.tables where 1=sleep(100000)';
disable_query_log; disable_query_log;
eval kill $ID; eval kill $ID;
enable_query_log; enable_query_log;
disconnect conn1;
let $wait_timeout= 10; let $wait_timeout= 10;
let $wait_condition=select count(*)=0 from information_schema.processlist let $wait_condition=select count(*)=0 from information_schema.processlist
where state='User sleep' and where state='User sleep' and
info='select * from information_schema.tables where 1=sleep(100000)'; info='select * from information_schema.tables where 1=sleep(100000)';
--source include/wait_condition.inc --source include/wait_condition.inc
connection conn1;
--error 2013,ER_CONNECTION_KILLED
reap;
connection default;
disconnect conn1;
connect (conn1, localhost, root,,); connect (conn1, localhost, root,,);
connection conn1; connection conn1;
...@@ -1318,12 +1322,16 @@ info='select * from information_schema.columns where 1=sleep(100000)'; ...@@ -1318,12 +1322,16 @@ info='select * from information_schema.columns where 1=sleep(100000)';
disable_query_log; disable_query_log;
eval kill $ID; eval kill $ID;
enable_query_log; enable_query_log;
disconnect conn1;
let $wait_timeout= 10; let $wait_timeout= 10;
let $wait_condition=select count(*)=0 from information_schema.processlist let $wait_condition=select count(*)=0 from information_schema.processlist
where state='User sleep' and where state='User sleep' and
info='select * from information_schema.columns where 1=sleep(100000)'; info='select * from information_schema.columns where 1=sleep(100000)';
--source include/wait_condition.inc --source include/wait_condition.inc
connection conn1;
--error 2013,ER_CONNECTION_KILLED
reap;
connection default;
disconnect conn1;
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment