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/event_parse_data.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/event_parse_data.cc')
| -rw-r--r-- | sql/event_parse_data.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/event_parse_data.cc b/sql/event_parse_data.cc index ad812a6aa5d..4316a9f1fb8 100644 --- a/sql/event_parse_data.cc +++ b/sql/event_parse_data.cc @@ -574,8 +574,8 @@ void Event_parse_data::check_originator_id(THD *thd) status= Event_parse_data::SLAVESIDE_DISABLED; status_changed= true; } - originator = thd->server_id; + originator = thd->variables.server_id; } else - originator = server_id; + originator = global_system_variables.server_id; } |