diff options
author | unknown <knielsen@knielsen-hq.org> | 2013-04-15 10:55:27 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2013-04-15 10:55:27 +0200 |
commit | 665a31af2b7d0ecd66d5e54ed0544b5db3892732 (patch) | |
tree | d19eae18ae9ffff6e7b3d30b16cf7671c511700f /storage | |
parent | 491047a24714be57409e42656057e56f99c65513 (diff) | |
parent | e5cbefeb899f6325fc99277c515a91f0843cdcd5 (diff) | |
download | mariadb-git-665a31af2b7d0ecd66d5e54ed0544b5db3892732.tar.gz |
MDEV-26: Global transaction ID. First alpha release.
Merge of 10.0-mdev26 feature tree into 10.0-base.
Global transaction ID is prepended to each event group in the binlog.
Slave connect can request to start from GTID position instead of specifying
file name/offset of master binlog. This facilitates easy switch to a new
master.
Slave GTID state is stored in a table mysql.rpl_slave_state, which can be
InnoDB to get crash-safe slave state.
GTID includes a replication domain ID, allowing to keep track of distinct
positions for each of multiple masters.
Diffstat (limited to 'storage')
-rw-r--r-- | storage/sequence/mysql-test/sequence/simple.result | 8 | ||||
-rw-r--r-- | storage/sequence/mysql-test/sequence/simple.test | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/storage/sequence/mysql-test/sequence/simple.result b/storage/sequence/mysql-test/sequence/simple.result index b14fde2cfef..2d56e57d199 100644 --- a/storage/sequence/mysql-test/sequence/simple.result +++ b/storage/sequence/mysql-test/sequence/simple.result @@ -262,9 +262,9 @@ commit; select count(*) from t1; count(*) 10 -show binlog events limit 2,10; +show binlog events from <binlog_start> limit 10; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 286 Query 1 354 BEGIN -master-bin.000001 354 Query 1 452 use test; insert t1 select * from seq_1_to_10 -master-bin.000001 452 Xid 1 479 COMMIT /* xid */ +master-bin.000001 # Gtid # # BEGIN GTID #-#-# +master-bin.000001 # Query # # use test; insert t1 select * from seq_1_to_10 +master-bin.000001 # Xid # # COMMIT /* XID */ drop table t1; diff --git a/storage/sequence/mysql-test/sequence/simple.test b/storage/sequence/mysql-test/sequence/simple.test index 9559e42fafd..b16c954176e 100644 --- a/storage/sequence/mysql-test/sequence/simple.test +++ b/storage/sequence/mysql-test/sequence/simple.test @@ -87,7 +87,7 @@ rollback to savepoint s1; commit; select count(*) from t1; # must show Xid event ---replace_regex /xid=[0-9]+/xid/ -show binlog events limit 2,10; +let $binlog_limit= 10; +--source include/show_binlog_events.inc drop table t1; |