mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01: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.
44 lines
1 KiB
Text
44 lines
1 KiB
Text
source include/master-slave.inc;
|
|
-- source include/have_innodb.inc
|
|
-- source include/not_embedded.inc
|
|
-- source include/have_binlog_format_mixed_or_statement.inc
|
|
|
|
let $VERSION=`select version()`;
|
|
|
|
# Bug #21975: grant/revoke statements in transaction
|
|
# used to disappear from binlog upon rallback.
|
|
# Now GRANT/REVOKE do implicitly commit
|
|
# transaction
|
|
|
|
--disable_warnings
|
|
drop database if exists d1;
|
|
--enable_warnings
|
|
create database d1;
|
|
use d1;
|
|
create table t (s1 int) engine=innodb;
|
|
set @@autocommit=0;
|
|
start transaction;
|
|
insert into t values (1);
|
|
grant select on t to x@y;
|
|
let $wait_binlog_event= grant select;
|
|
source include/wait_for_binlog_event.inc;
|
|
#
|
|
# There is no active transaction here
|
|
#
|
|
rollback;
|
|
show grants for x@y;
|
|
start transaction;
|
|
insert into t values (2);
|
|
revoke select on t from x@y;
|
|
let $wait_binlog_event= revoke select;
|
|
source include/wait_for_binlog_event.inc;
|
|
#
|
|
# There is no active transaction here
|
|
#
|
|
commit;
|
|
select * from t;
|
|
show grants for x@y;
|
|
drop user x@y;
|
|
drop database d1;
|
|
--sync_slave_with_master
|
|
--source include/rpl_end.inc
|