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_injector.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_injector.cc')
| -rw-r--r-- | sql/rpl_injector.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/rpl_injector.cc b/sql/rpl_injector.cc index ec1a96e8a2b..a4b04d2e047 100644 --- a/sql/rpl_injector.cc +++ b/sql/rpl_injector.cc @@ -108,7 +108,7 @@ int injector::transaction::use_table(server_id_type sid, table tbl) if ((error= check_state(TABLE_STATE))) DBUG_RETURN(error); - server_id_type save_id= m_thd->server_id; + server_id_type save_id= m_thd->variables.server_id; m_thd->set_server_id(sid); error= m_thd->binlog_write_table_map(tbl.get_table(), tbl.is_transactional()); @@ -127,7 +127,7 @@ int injector::transaction::write_row (server_id_type sid, table tbl, if (error) DBUG_RETURN(error); - server_id_type save_id= m_thd->server_id; + server_id_type save_id= m_thd->variables.server_id; m_thd->set_server_id(sid); error= m_thd->binlog_write_row(tbl.get_table(), tbl.is_transactional(), cols, colcnt, record); @@ -146,7 +146,7 @@ int injector::transaction::delete_row(server_id_type sid, table tbl, if (error) DBUG_RETURN(error); - server_id_type save_id= m_thd->server_id; + server_id_type save_id= m_thd->variables.server_id; m_thd->set_server_id(sid); error= m_thd->binlog_delete_row(tbl.get_table(), tbl.is_transactional(), cols, colcnt, record); @@ -165,7 +165,7 @@ int injector::transaction::update_row(server_id_type sid, table tbl, if (error) DBUG_RETURN(error); - server_id_type save_id= m_thd->server_id; + server_id_type save_id= m_thd->variables.server_id; m_thd->set_server_id(sid); error= m_thd->binlog_update_row(tbl.get_table(), tbl.is_transactional(), cols, colcnt, before, after); |