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 /sql/rpl_handler.cc | |
| 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 'sql/rpl_handler.cc')
| -rw-r--r-- | sql/rpl_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc index 1d21b3f9445..2777dabf451 100644 --- a/sql/rpl_handler.cc +++ b/sql/rpl_handler.cc @@ -176,7 +176,7 @@ void delegates_destroy() plugins add to thd->lex will be automatically unlocked. */ #define FOREACH_OBSERVER(r, f, thd, args) \ - param.server_id= thd->server_id; \ + param.server_id= thd->variables.server_id; \ /* Use a struct to make sure that they are allocated adjacent, check delete_dynamic(). @@ -348,7 +348,7 @@ int Binlog_transmit_delegate::reserve_header(THD *thd, ushort flags, ulong hlen; Binlog_transmit_param param; param.flags= flags; - param.server_id= thd->server_id; + param.server_id= thd->variables.server_id; int ret= 0; read_lock(); |