Fix a failure of this test case on HP-UX.
mysql-test/r/information_schema.result: Fix a race in the test case (second attempt). mysql-test/t/information_schema.test: Fix a race in the test case (second attempt).
This commit is contained in:
parent
65e5af7b7f
commit
a0c4e184f8
@ -1409,31 +1409,33 @@ user db
|
||||
user3148 test
|
||||
drop user user3148@localhost;
|
||||
DROP TABLE IF EXISTS thread_status;
|
||||
CREATE TABLE thread_status (variable_name VARCHAR(64),
|
||||
variable_value DECIMAL(22,7));
|
||||
CREATE TABLE server_status (variable_name VARCHAR(64),
|
||||
variable_value DECIMAL(22,7));
|
||||
DROP EVENT IF EXISTS log_status;
|
||||
CREATE EVENT log_status
|
||||
DROP TABLE IF EXISTS server_status;
|
||||
DROP EVENT IF EXISTS event_status;
|
||||
SET GLOBAL event_scheduler=1;
|
||||
CREATE EVENT event_status
|
||||
ON SCHEDULE AT NOW()
|
||||
ON COMPLETION PRESERVE
|
||||
ON COMPLETION NOT PRESERVE
|
||||
DO
|
||||
BEGIN
|
||||
INSERT INTO thread_status SELECT variable_name, variable_value FROM
|
||||
information_schema.session_status;
|
||||
INSERT INTO server_status SELECT variable_name, variable_value FROM
|
||||
information_schema.global_status;
|
||||
CREATE TABLE thread_status
|
||||
SELECT variable_name, variable_value
|
||||
FROM information_schema.session_status
|
||||
WHERE variable_name LIKE 'SSL_ACCEPTS' OR
|
||||
variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
|
||||
CREATE TABLE server_status
|
||||
SELECT variable_name
|
||||
FROM information_schema.global_status
|
||||
WHERE variable_name LIKE 'ABORTED_CONNECTS' OR
|
||||
variable_name LIKE 'BINLOG_CACHE_DISK_USE';
|
||||
END$$
|
||||
SET GLOBAL event_scheduler=1;
|
||||
SELECT * FROM thread_status WHERE variable_name LIKE 'SSL%' LIMIT 1,2;
|
||||
SELECT variable_name, variable_value FROM thread_status;
|
||||
variable_name variable_value
|
||||
SSL_ACCEPTS 0.0000000
|
||||
SSL_CALLBACK_CACHE_HITS 0.0000000
|
||||
SELECT variable_name FROM server_status LIMIT 1,2;
|
||||
SELECT variable_name FROM server_status;
|
||||
variable_name
|
||||
ABORTED_CONNECTS
|
||||
BINLOG_CACHE_DISK_USE
|
||||
DROP EVENT log_status;
|
||||
DROP TABLE thread_status;
|
||||
DROP TABLE server_status;
|
||||
SET GLOBAL event_scheduler=0;
|
||||
|
@ -1049,36 +1049,42 @@ drop user user3148@localhost;
|
||||
#
|
||||
--disable_warnings
|
||||
DROP TABLE IF EXISTS thread_status;
|
||||
CREATE TABLE thread_status (variable_name VARCHAR(64),
|
||||
variable_value DECIMAL(22,7));
|
||||
CREATE TABLE server_status (variable_name VARCHAR(64),
|
||||
variable_value DECIMAL(22,7));
|
||||
DROP EVENT IF EXISTS log_status;
|
||||
DROP TABLE IF EXISTS server_status;
|
||||
DROP EVENT IF EXISTS event_status;
|
||||
|
||||
--enable_warnings
|
||||
|
||||
SET GLOBAL event_scheduler=1;
|
||||
|
||||
DELIMITER $$;
|
||||
|
||||
CREATE EVENT log_status
|
||||
CREATE EVENT event_status
|
||||
ON SCHEDULE AT NOW()
|
||||
ON COMPLETION PRESERVE
|
||||
ON COMPLETION NOT PRESERVE
|
||||
DO
|
||||
BEGIN
|
||||
INSERT INTO thread_status SELECT variable_name, variable_value FROM
|
||||
information_schema.session_status;
|
||||
INSERT INTO server_status SELECT variable_name, variable_value FROM
|
||||
information_schema.global_status;
|
||||
END$$
|
||||
BEGIN
|
||||
CREATE TABLE thread_status
|
||||
SELECT variable_name, variable_value
|
||||
FROM information_schema.session_status
|
||||
WHERE variable_name LIKE 'SSL_ACCEPTS' OR
|
||||
variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
|
||||
|
||||
CREATE TABLE server_status
|
||||
SELECT variable_name
|
||||
FROM information_schema.global_status
|
||||
WHERE variable_name LIKE 'ABORTED_CONNECTS' OR
|
||||
variable_name LIKE 'BINLOG_CACHE_DISK_USE';
|
||||
END$$
|
||||
|
||||
DELIMITER ;$$
|
||||
|
||||
SET GLOBAL event_scheduler=1;
|
||||
let $wait_condition=select count(variable_name) != 0 from server_status;
|
||||
let $wait_condition=select count(*) = 0 from information_schema.events where event_name='event_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;
|
||||
SELECT variable_name, variable_value FROM thread_status;
|
||||
SELECT variable_name FROM server_status;
|
||||
|
||||
DROP TABLE thread_status;
|
||||
DROP TABLE server_status;
|
||||
SET GLOBAL event_scheduler=0;
|
||||
|
Loading…
x
Reference in New Issue
Block a user