mirror of
https://github.com/MariaDB/server.git
synced 2025-08-10 04:21:36 +02:00
bead24b7f3
Remove one of the major sources of race condiitons in mariadb-test. Normally, mariadb_close() sends COM_QUIT to the server and immediately disconnects. In mariadb-test it means the test can switch to another connection and sends queries to the server before the server even started parsing the COM_QUIT packet and these queries can see the connection as fully active, as it didn't reach dispatch_command yet. This is a major source of instability in tests and many - but not all, still less than a half - tests employ workarounds. The correct one is a pair count_sessions.inc/wait_until_count_sessions.inc. Also very popular was wait_until_disconnected.inc, which was completely useless, because it verifies that the connection is closed, and after disconnect it always is, it didn't verify whether the server processed COM_QUIT. Sadly the placebo was as widely used as the real thing. Let's fix this by making mariadb-test `disconnect` command _to wait_ for the server to confirm. This makes almost all workarounds redundant. In some cases count_sessions.inc/wait_until_count_sessions.inc is still needed, though, as only `disconnect` command is changed: * after external tools, like `exec $MYSQL` * after failed `connect` command * replication, after `STOP SLAVE` * Federated/CONNECT/SPIDER/etc after `DROP TABLE` and also in some XA tests, because an XA transaction is dissociated from the THD very late, after the server has closed the client connection. Collateral cleanups: fix comments, remove some redundant statements: * DROP IF EXISTS if nothing is known to exist * DROP table/view before DROP DATABASE * REVOKE privileges before DROP USER etc
60 lines
1.6 KiB
Text
60 lines
1.6 KiB
Text
-- source include/not_embedded.inc
|
|
|
|
--echo #
|
|
--echo # Start of 10.5 tests
|
|
--echo #
|
|
|
|
--echo #
|
|
--echo # MDEV-21743 Split up SUPER privilege to smaller privileges
|
|
--echo #
|
|
--disable_service_connection
|
|
|
|
--echo #
|
|
--echo # Test that KILL is not allowed without CONNECTION ADMIN
|
|
--echo #
|
|
|
|
CREATE USER foo@localhost;
|
|
GRANT SELECT ON *.* TO foo@localhost;
|
|
CREATE USER bar@localhost;
|
|
GRANT ALL PRIVILEGES ON *.* TO bar@localhost;
|
|
REVOKE CONNECTION ADMIN ON *.* FROM bar@localhost;
|
|
--connect (foo,localhost,foo,,)
|
|
let $id=`(SELECT id FROM INFORMATION_SCHEMA.PROCESSLIST WHERE user='foo')`;
|
|
--connect (bar,localhost,bar,,)
|
|
SELECT user FROM information_schema.processlist ORDER BY user;
|
|
--replace_result $id ID
|
|
--error ER_KILL_DENIED_ERROR
|
|
--eval KILL $id
|
|
--disconnect foo
|
|
--disconnect bar
|
|
--connection default
|
|
DROP USER foo@localhost;
|
|
DROP USER bar@localhost;
|
|
|
|
--echo #
|
|
--echo # Test that KILL is allowed with CONNECTION ADMIN
|
|
--echo #
|
|
|
|
CREATE USER foo@localhost;
|
|
GRANT SELECT ON *.* TO foo@localhost;
|
|
CREATE USER bar@localhost;
|
|
GRANT PROCESS, CONNECTION ADMIN ON *.* TO bar@localhost;
|
|
--connect (foo,localhost,foo,,)
|
|
let $id=`(SELECT id FROM INFORMATION_SCHEMA.PROCESSLIST WHERE user='foo')`;
|
|
--connect (bar,localhost,bar,,)
|
|
SELECT user FROM information_schema.processlist ORDER BY user;
|
|
--replace_result $id ID
|
|
--eval KILL $id
|
|
--connection default
|
|
let $wait_condition=
|
|
select count(*) = 0 from information_schema.processlist
|
|
where user = "foo";
|
|
--source include/wait_condition.inc
|
|
--disconnect foo
|
|
--disconnect bar
|
|
DROP USER foo@localhost;
|
|
DROP USER bar@localhost;
|
|
|
|
--enable_service_connection
|
|
|
|
--echo # End of 10.5 tests
|