Fix a race that breaks the valgrind build.
mysql-test/r/information_schema.result: Fix a race (updated result file) mysql-test/t/information_schema.test: Fix a race in a test.
This commit is contained in:
parent
62569b757d
commit
65e5af7b7f
@ -1415,7 +1415,8 @@ CREATE TABLE server_status (variable_name VARCHAR(64),
|
||||
variable_value DECIMAL(22,7));
|
||||
DROP EVENT IF EXISTS log_status;
|
||||
CREATE EVENT log_status
|
||||
ON SCHEDULE EVERY 1 SECOND
|
||||
ON SCHEDULE AT NOW()
|
||||
ON COMPLETION PRESERVE
|
||||
DO
|
||||
BEGIN
|
||||
INSERT INTO thread_status SELECT variable_name, variable_value FROM
|
||||
|
@ -1059,7 +1059,8 @@ DROP EVENT IF EXISTS log_status;
|
||||
DELIMITER $$;
|
||||
|
||||
CREATE EVENT log_status
|
||||
ON SCHEDULE EVERY 1 SECOND
|
||||
ON SCHEDULE AT NOW()
|
||||
ON COMPLETION PRESERVE
|
||||
DO
|
||||
BEGIN
|
||||
INSERT INTO thread_status SELECT variable_name, variable_value FROM
|
||||
@ -1071,12 +1072,12 @@ information_schema.global_status;
|
||||
DELIMITER ;$$
|
||||
|
||||
SET GLOBAL event_scheduler=1;
|
||||
sleep 1;
|
||||
let $wait_condition=select count(variable_name) != 0 from server_status;
|
||||
let $wait_timeout=30;
|
||||
--source include/wait_condition.inc
|
||||
SELECT * FROM thread_status WHERE variable_name LIKE 'SSL%' LIMIT 1,2;
|
||||
SELECT variable_name FROM server_status LIMIT 1,2;
|
||||
|
||||
|
||||
|
||||
DROP EVENT log_status;
|
||||
DROP TABLE thread_status;
|
||||
DROP TABLE server_status;
|
||||
|
Loading…
x
Reference in New Issue
Block a user