mirror of
https://github.com/MariaDB/server.git
synced 2025-08-05 13:16:09 +03:00
Rewrite test case for BUG 25843 to avoid SHOW BINLOG EVENTS
statement. mysql-test/suite/rpl/r/rpl_ps.result: Update result file.
This commit is contained in:
@@ -34,17 +34,18 @@ stop slave;
|
|||||||
#
|
#
|
||||||
########################################################################
|
########################################################################
|
||||||
|
|
||||||
#
|
# Connection: slave
|
||||||
# Check that binlog is filled properly.
|
|
||||||
#
|
|
||||||
|
START SLAVE;
|
||||||
|
|
||||||
|
# Connection: master
|
||||||
|
|
||||||
|
|
||||||
CREATE DATABASE mysqltest1;
|
CREATE DATABASE mysqltest1;
|
||||||
CREATE TABLE t1(c INT);
|
CREATE TABLE t1(db_name CHAR(32), db_col_name CHAR(32));
|
||||||
|
|
||||||
RESET MASTER;
|
PREPARE stmt_d_1 FROM 'INSERT INTO t1 VALUES(DATABASE(), @@collation_database)';
|
||||||
RESET SLAVE;
|
|
||||||
|
|
||||||
PREPARE stmt_d_1 FROM 'INSERT INTO t1 VALUES(1)';
|
|
||||||
|
|
||||||
EXECUTE stmt_d_1;
|
EXECUTE stmt_d_1;
|
||||||
|
|
||||||
@@ -52,18 +53,28 @@ use mysqltest1;
|
|||||||
|
|
||||||
EXECUTE stmt_d_1;
|
EXECUTE stmt_d_1;
|
||||||
|
|
||||||
FLUSH LOGS;
|
|
||||||
|
|
||||||
SHOW BINLOG EVENTS FROM 106;
|
# Connection: slave
|
||||||
Log_name Pos Event_type Server_id End_log_pos Info
|
|
||||||
slave-bin.000001 106 Query 2 193 use `test`; INSERT INTO t1 VALUES(1)
|
|
||||||
slave-bin.000001 193 Query 2 280 use `test`; INSERT INTO t1 VALUES(1)
|
SELECT * FROM t1;
|
||||||
slave-bin.000001 280 Rotate 2 323 slave-bin.000002;pos=4
|
db_name db_col_name
|
||||||
|
test latin1_swedish_ci
|
||||||
|
test latin1_swedish_ci
|
||||||
|
|
||||||
|
# Connection: master
|
||||||
|
|
||||||
|
|
||||||
DROP DATABASE mysqltest1;
|
DROP DATABASE mysqltest1;
|
||||||
|
|
||||||
use test;
|
use test;
|
||||||
|
|
||||||
|
|
||||||
|
# Connection: slave
|
||||||
|
|
||||||
|
|
||||||
|
STOP SLAVE;
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
reset master;
|
reset master;
|
||||||
reset slave;
|
reset slave;
|
||||||
|
@@ -73,20 +73,24 @@ stop slave;
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
--echo
|
--echo
|
||||||
--echo #
|
--echo # Connection: slave
|
||||||
--echo # Check that binlog is filled properly.
|
--echo
|
||||||
--echo #
|
--connection slave
|
||||||
|
|
||||||
|
--echo
|
||||||
|
START SLAVE;
|
||||||
|
|
||||||
|
--echo
|
||||||
|
--echo # Connection: master
|
||||||
|
--echo
|
||||||
|
--connection master
|
||||||
|
|
||||||
--echo
|
--echo
|
||||||
CREATE DATABASE mysqltest1;
|
CREATE DATABASE mysqltest1;
|
||||||
CREATE TABLE t1(c INT);
|
CREATE TABLE t1(db_name CHAR(32), db_col_name CHAR(32));
|
||||||
|
|
||||||
--echo
|
--echo
|
||||||
RESET MASTER;
|
PREPARE stmt_d_1 FROM 'INSERT INTO t1 VALUES(DATABASE(), @@collation_database)';
|
||||||
RESET SLAVE;
|
|
||||||
|
|
||||||
--echo
|
|
||||||
PREPARE stmt_d_1 FROM 'INSERT INTO t1 VALUES(1)';
|
|
||||||
|
|
||||||
--echo
|
--echo
|
||||||
EXECUTE stmt_d_1;
|
EXECUTE stmt_d_1;
|
||||||
@@ -98,10 +102,21 @@ use mysqltest1;
|
|||||||
EXECUTE stmt_d_1;
|
EXECUTE stmt_d_1;
|
||||||
|
|
||||||
--echo
|
--echo
|
||||||
FLUSH LOGS;
|
--save_master_pos
|
||||||
|
|
||||||
--echo
|
--echo
|
||||||
SHOW BINLOG EVENTS FROM 106;
|
--echo # Connection: slave
|
||||||
|
--echo
|
||||||
|
--connection slave
|
||||||
|
--sync_with_master
|
||||||
|
|
||||||
|
--echo
|
||||||
|
SELECT * FROM t1;
|
||||||
|
|
||||||
|
--echo
|
||||||
|
--echo # Connection: master
|
||||||
|
--echo
|
||||||
|
--connection master
|
||||||
|
|
||||||
--echo
|
--echo
|
||||||
DROP DATABASE mysqltest1;
|
DROP DATABASE mysqltest1;
|
||||||
@@ -109,6 +124,18 @@ DROP DATABASE mysqltest1;
|
|||||||
--echo
|
--echo
|
||||||
use test;
|
use test;
|
||||||
|
|
||||||
|
--echo
|
||||||
|
--save_master_pos
|
||||||
|
|
||||||
|
--echo
|
||||||
|
--echo # Connection: slave
|
||||||
|
--echo
|
||||||
|
--connection slave
|
||||||
|
--sync_with_master
|
||||||
|
|
||||||
|
--echo
|
||||||
|
STOP SLAVE;
|
||||||
|
|
||||||
--echo
|
--echo
|
||||||
--echo ########################################################################
|
--echo ########################################################################
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user