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/item_func.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/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index aca76eac82a..8b4e5542a1f 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -6857,7 +6857,7 @@ ulonglong uuid_value; void uuid_short_init() { - uuid_value= ((((ulonglong) server_id) << 56) + + uuid_value= ((((ulonglong) global_system_variables.server_id) << 56) + (((ulonglong) server_start_time) << 24)); } |