1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Manual merge

This commit is contained in:
unknown
2010-05-26 22:34:25 +08:00
198 changed files with 3603 additions and 10089 deletions

View File

@ -51,18 +51,24 @@ CREATE TABLE t1(a int, UNIQUE(a));
INSERT DELAYED IGNORE INTO t1 VALUES(1);
INSERT DELAYED IGNORE INTO t1 VALUES(1);
flush table t1;
show binlog events in 'master-bin.000002' LIMIT 2,2;
show binlog events in 'master-bin.000002' from <binlog_start> limit 1,4;
Log_name Pos Event_type Server_id End_log_pos Info
x x x x x BEGIN
x x x x x use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
master-bin.000002 # Query # # BEGIN
master-bin.000002 # Query # # use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
master-bin.000002 # Query # # use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
master-bin.000002 # Query # # COMMIT
select * from t1;
a
1
On slave
show binlog events in 'slave-bin.000002' LIMIT 2,2;
show binlog events in 'slave-bin.000002' from <binlog_start> limit 1,6;
Log_name Pos Event_type Server_id End_log_pos Info
x x x x x BEGIN
x x x x x use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
slave-bin.000002 # Query # # BEGIN
slave-bin.000002 # Query # # use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
slave-bin.000002 # Query # # COMMIT
slave-bin.000002 # Query # # BEGIN
slave-bin.000002 # Query # # use `test`; INSERT DELAYED IGNORE INTO t1 VALUES(1)
slave-bin.000002 # Query # # COMMIT
select * from t1;
a
1