From ab8e8f4b277c23e6989650e0590ec0a5fa03fb3a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 23 Oct 2012 12:46:29 +0200 Subject: 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. --- sql/rpl_handler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/rpl_handler.cc') 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(); -- cgit v1.2.1