summaryrefslogtreecommitdiff
path: root/mysql-test/r/connect.result
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-05-28 15:39:56 +0200
committerunknown <knielsen@knielsen-hq.org>2013-05-28 15:39:56 +0200
commita0fd7382bc1e4a8ba0affd27d3034f445a4bb453 (patch)
treec8b4b1dabddbc47829a890d74025f7889e692425 /mysql-test/r/connect.result
parent08ce9bfe057b6cd31e7fbca4e4e9e48edde242fb (diff)
parentee2b7db3f88f6882022a8aa71b30043ed8b40792 (diff)
downloadmariadb-git-a0fd7382bc1e4a8ba0affd27d3034f445a4bb453.tar.gz
Merge 10.0-base -> 10.0
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 94c68324149..3fcc5b5d2c1 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
@@ -20,7 +21,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info
@@ -50,6 +50,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -63,7 +64,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info
@@ -101,6 +101,7 @@ db
event
func
general_log
+gtid_slave_pos
help_category
help_keyword
help_relation
@@ -114,7 +115,6 @@ plugin
proc
procs_priv
proxies_priv
-rpl_slave_state
servers
slave_master_info
slave_relay_log_info