diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-10-23 12:46:29 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-10-23 12:46:29 +0200 |
| commit | ab8e8f4b277c23e6989650e0590ec0a5fa03fb3a (patch) | |
| tree | 55f94a23720a018908f99044fffd407b63ed7426 /sql/rpl_handler.cc | |
| parent | be86e4428010f41804608c2d2ff7adcd9d6fb270 (diff) | |
| download | mariadb-git-ab8e8f4b277c23e6989650e0590ec0a5fa03fb3a.tar.gz | |
MDEV-500: Session variable for server_id
MDEV-26: Global transaction id, partial commit
Change server_id to be a session variable.
User with SUPER can set it to binlog with different server_id.
Implement backward-compatible ::server_id mirror for plugins.
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 258dae0edb2..b100e8b5185 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(); |