mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge Percona patch MWL#47 into mariadb 5.2-percona.
This patch adds options to annotate the binlog (and the mysqlbinlog output) with the original SQL query for queries that are logged using row-based replication.
This commit is contained in:
unknown
144
mysql-test/suite/rpl/r/rpl_row_annotate_do.result
Normal file
144
mysql-test/suite/rpl/r/rpl_row_annotate_do.result
Normal file
@ -0,0 +1,144 @@
|
||||
stop slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
reset master;
|
||||
reset slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
start slave;
|
||||
########################################################################
|
||||
# TABLES ON MASTER
|
||||
########################################################################
|
||||
SELECT * FROM t1 ORDER BY a;
|
||||
a b
|
||||
0 1
|
||||
SELECT * FROM t2 ORDER BY a;
|
||||
a b
|
||||
SELECT * FROM t3 ORDER BY a;
|
||||
a b
|
||||
1 1
|
||||
2 2
|
||||
3 3
|
||||
SELECT * FROM t5 ORDER BY a;
|
||||
a b
|
||||
1 foo
|
||||
2 bar
|
||||
3 baz
|
||||
4 g<>s
|
||||
5 g<>s
|
||||
########################################################################
|
||||
# TABLES ON SLAVE: should be the same as on master
|
||||
########################################################################
|
||||
SELECT * FROM t1 ORDER BY a;
|
||||
a b
|
||||
0 1
|
||||
SELECT * FROM t2 ORDER BY a;
|
||||
a b
|
||||
SELECT * FROM t3 ORDER BY a;
|
||||
a b
|
||||
1 1
|
||||
2 2
|
||||
3 3
|
||||
SELECT * FROM t5 ORDER BY a;
|
||||
a b
|
||||
1 foo
|
||||
2 bar
|
||||
3 baz
|
||||
4 g<>s
|
||||
5 g<>s
|
||||
########################################################################
|
||||
# EVENTS ON SLAVE
|
||||
# The following Annotate_rows events should appear below:
|
||||
# - UPDATE t1 SET b = b + 1;
|
||||
# - REPLACE t1 VALUES (1,1), (2,2), (3,3);
|
||||
# - INSERT INTO t2 VALUES (1,1), (2,2), (3,3)
|
||||
# - INSERT INTO t3 VALUES (1,1), (2,2), (3,3)
|
||||
# - DELETE t1, t2 FROM <...>
|
||||
# - INSERT INTO t2 VALUES (1,1), (2,2), (3,3)
|
||||
# - DELETE xt1, t2 FROM <...>
|
||||
# - INSERT INTO t5(b) VALUES <...> (3 instances)
|
||||
########################################################################
|
||||
FLUSH LOGS;
|
||||
show binlog events in 'slave-bin.000001' from <start_pos>;
|
||||
Log_name Pos Event_type Server_id End_log_pos Info
|
||||
slave-bin.000001 # Query 1 # DROP DATABASE IF EXISTS test1
|
||||
slave-bin.000001 # Query 1 # CREATE DATABASE test1
|
||||
slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t1(a int primary key, b int)
|
||||
slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t2(a int, b int)
|
||||
slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t3(a int, b int)
|
||||
slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t4(a int, b int)
|
||||
slave-bin.000001 # Query 1 # use `test1`; CREATE TABLE t5 (
|
||||
a INT PRIMARY KEY AUTO_INCREMENT,
|
||||
b VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_bin
|
||||
)
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
|
||||
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Annotate_rows 1 # UPDATE t1 SET b = b + 1
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
|
||||
slave-bin.000001 # Update_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Annotate_rows 1 # REPLACE t1 VALUES (1,1), (2,2), (3,3)
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
|
||||
slave-bin.000001 # Update_rows 1 # table_id: #
|
||||
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Annotate_rows 1 # INSERT INTO t2 VALUES (1,1), (2,2), (3,3)
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
|
||||
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Annotate_rows 1 # INSERT INTO t3 VALUES (1,1), (2,2), (3,3)
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t3)
|
||||
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Annotate_rows 1 # DELETE t1, t2 FROM t1 INNER JOIN t2 INNER JOIN t3 WHERE t1.a=t2.a AND t2.a=t3.a
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t1)
|
||||
slave-bin.000001 # Delete_rows 1 # table_id: #
|
||||
slave-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Annotate_rows 1 # INSERT INTO t2 VALUES (1,1), (2,2), (3,3)
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
|
||||
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Annotate_rows 1 # DELETE xt1, t2 FROM xt1 INNER JOIN t2 INNER JOIN t3 WHERE xt1.a=t2.a AND t2.a=t3.a
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t2)
|
||||
slave-bin.000001 # Delete_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Annotate_rows 1 # INSERT INTO t5(b) VALUES ('foo'), ('bar'), ('baz')
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t5)
|
||||
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Annotate_rows 1 # INSERT INTO t5(b) VALUES ('g<>s')
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t5)
|
||||
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Query 1 # BEGIN
|
||||
slave-bin.000001 # Annotate_rows 1 # INSERT INTO t5(b) VALUES ('gås')
|
||||
slave-bin.000001 # Table_map 1 # table_id: # (test1.t5)
|
||||
slave-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
|
||||
slave-bin.000001 # Query 1 # COMMIT
|
||||
slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
|
||||
#
|
||||
########################################################################
|
||||
# INSERTs DELAYED ON MASTERs
|
||||
########################################################################
|
||||
SET SESSION binlog_annotate_rows_events = ON;
|
||||
INSERT DELAYED INTO test1.t4 VALUES (1,1);
|
||||
FLUSH TABLES;
|
||||
SELECT * FROM test1.t4 ORDER BY a;
|
||||
a b
|
||||
1 1
|
||||
########################################################################
|
||||
# ON SLAVE
|
||||
# No Annotate_rows events should appear below
|
||||
########################################################################
|
||||
FLUSH LOGS;
|
||||
Reference in New Issue
Block a user