Commit 65e5af7b authored by unknown's avatar unknown
Browse files

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.
parent 62569b75

mysql-test/r/information_schema.result

+2 −1
Original line number Diff line number Diff line
@@ -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

mysql-test/t/information_schema.test

+5 −4
Original line number Diff line number Diff line
@@ -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;