mirror of
https://github.com/MariaDB/server.git
synced 2025-12-09 08:01:34 +03:00
09c80e12c5
Major replication test framework cleanup. This does the following:
- Ensure that all tests clean up the replication state when they
finish, by making check-testcase check the output of SHOW SLAVE STATUS.
This implies:
- Slave must not be running after test finished. This is good
because it removes the risk for sporadic errors in subsequent
tests when a test forgets to sync correctly.
- Slave SQL and IO errors must be cleared when test ends. This is
good because we will notice if a test gets an unexpected error in
the slave threads near the end.
- We no longer have to clean up before a test starts.
- Ensure that all tests that wait for an error in one of the slave
threads waits for a specific error. It is no longer possible to
source wait_for_slave_[sql|io]_to_stop.inc when there is an error
in one of the slave threads. This is good because:
- If a test expects an error but there is a bug that causes
another error to happen, or if it stops the slave thread without
an error, then we will notice.
- When developing tests, wait_for_*_to_[start|stop].inc will fail
immediately if there is an error in the relevant slave thread.
Before this patch, we had to wait for the timeout.
- Remove duplicated and repeated code for setting up unusual replication
topologies. Now, there is a single file that is capable of setting
up arbitrary topologies (include/rpl_init.inc, but
include/master-slave.inc is still available for the most common
topology). Tests can now end with include/rpl_end.inc, which will clean
up correctly no matter what topology is used. The topology can be
changed with include/rpl_change_topology.inc.
- Improved debug information when tests fail. This includes:
- debug info is printed on all servers configured by include/rpl_init.inc
- User can set $rpl_debug=1, which makes auxiliary replication files
print relevant debug info.
- Improved documentation for all auxiliary replication files. Now they
describe purpose, usage, parameters, and side effects.
- Many small code cleanups:
- Made have_innodb.inc output a sensible error message.
- Moved contents of rpl000017-slave.sh into rpl000017.test
- Added mysqltest variables that expose the current state of
disable_warnings/enable_warnings and friends.
- Too many to list here: see per-file comments for details.
67 lines
1.8 KiB
Plaintext
67 lines
1.8 KiB
Plaintext
include/master-slave.inc
|
|
[connection master]
|
|
DROP PROCEDURE IF EXISTS test.p1;
|
|
DROP PROCEDURE IF EXISTS test.p2;
|
|
DROP PROCEDURE IF EXISTS test.p3;
|
|
DROP PROCEDURE IF EXISTS test.p4;
|
|
DROP PROCEDURE IF EXISTS test.p5;
|
|
DROP PROCEDURE IF EXISTS test.p6;
|
|
DROP PROCEDURE IF EXISTS test.p7;
|
|
DROP TABLE IF EXISTS test.t1;
|
|
DROP TABLE IF EXISTS test.t2;
|
|
CREATE TABLE test.t1 (a int, PRIMARY KEY(a));
|
|
INSERT INTO test.t1 VALUES (1);
|
|
CREATE PROCEDURE test.p1()
|
|
BEGIN
|
|
ALTER TABLE test.t1 ADD COLUMN b CHAR(4) AFTER a;
|
|
UPDATE test.t1 SET b = 'rbr' WHERE a = 1;
|
|
CALL test.p2();
|
|
END|
|
|
CREATE PROCEDURE test.p2()
|
|
BEGIN
|
|
ALTER TABLE test.t1 ADD COLUMN f FLOAT AFTER b;
|
|
UPDATE test.t1 SET f = RAND() WHERE a = 1;
|
|
CALL test.p3();
|
|
END|
|
|
CREATE PROCEDURE test.p3()
|
|
BEGIN
|
|
ALTER TABLE test.t1 RENAME test.t2;
|
|
CALL test.p4();
|
|
END|
|
|
CREATE PROCEDURE test.p4()
|
|
BEGIN
|
|
ALTER TABLE test.t2 ADD INDEX (f);
|
|
ALTER TABLE test.t2 CHANGE a a INT UNSIGNED NOT NULL AUTO_INCREMENT;
|
|
INSERT INTO test.t2 VALUES (NULL,'TEST',RAND());
|
|
CALL test.p5();
|
|
END|
|
|
CREATE PROCEDURE test.p5()
|
|
BEGIN
|
|
ALTER TABLE test.t2 ORDER BY f;
|
|
INSERT INTO test.t2 VALUES (NULL,'STM',RAND());
|
|
CALL test.p6();
|
|
END|
|
|
CREATE PROCEDURE test.p6()
|
|
BEGIN
|
|
ALTER TABLE test.t2 ADD COLUMN b2 CHAR(4) FIRST;
|
|
ALTER TABLE test.t2 ADD COLUMN to_drop BIT(8) AFTER b2;
|
|
INSERT INTO test.t2 VALUES ('new',1,NULL,'STM',RAND());
|
|
CALL test.p7();
|
|
END|
|
|
CREATE PROCEDURE test.p7()
|
|
BEGIN
|
|
ALTER TABLE test.t2 DROP COLUMN to_drop;
|
|
INSERT INTO test.t2 VALUES ('gone',NULL,'STM',RAND());
|
|
END|
|
|
CALL test.p1();
|
|
DROP PROCEDURE IF EXISTS test.p1;
|
|
DROP PROCEDURE IF EXISTS test.p2;
|
|
DROP PROCEDURE IF EXISTS test.p3;
|
|
DROP PROCEDURE IF EXISTS test.p4;
|
|
DROP PROCEDURE IF EXISTS test.p5;
|
|
DROP PROCEDURE IF EXISTS test.p6;
|
|
DROP PROCEDURE IF EXISTS test.p7;
|
|
DROP TABLE IF EXISTS test.t1;
|
|
DROP TABLE IF EXISTS test.t2;
|
|
include/rpl_end.inc
|