summaryrefslogtreecommitdiff
path: root/mysql-test/r/connect.result
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-05-22 17:36:48 +0200
committerunknown <knielsen@knielsen-hq.org>2013-05-22 17:36:48 +0200
commit1cd6eb5f942ca3e94e86a48512d992fbb3aeecd9 (patch)
treea23bba541fbfbc0fc92f9666d29340320b9be428 /mysql-test/r/connect.result
parentd795bc9ff8d4a4e17f249a0eb9ac01f25d53a259 (diff)
downloadmariadb-git-1cd6eb5f942ca3e94e86a48512d992fbb3aeecd9.tar.gz
MDEV-26: Global transaction ID.
Change of user interface to be more logical and more in line with expectations to work similar to old-style replication. User can now explicitly choose in CHANGE MASTER whether binlog position is taken into account (master_gtid_pos=current_pos) or not (master_gtid_pos= slave_pos) when slave connects to master. @@gtid_pos is replaced by three separate variables @@gtid_slave_pos (can be set by user, replicated GTIDs only), @@gtid_binlog_pos (read only), and @@gtid_current_pos (a combination of the two, most recent GTID within each domain). mysql.rpl_slave_state is renamed to mysql.gtid_slave_pos to match. This fixes MDEV-4474.
Diffstat (limited to 'mysql-test/r/connect.result')
-rw-r--r--mysql-test/r/connect.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result
index a533b495267..b90e558cfaa 100644
--- a/mysql-test/r/connect.result
+++ b/mysql-test/r/connect.result
@@ -7,6 +7,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -18,7 +19,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slow_log
table_stats
@@ -45,6 +45,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -56,7 +57,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slow_log
table_stats
@@ -91,6 +91,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -102,7 +103,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slow_log
table_stats