summaryrefslogtreecommitdiff
path: root/mysql-test/r/log_tables_upgrade.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/log_tables_upgrade.result
parent08ce9bfe057b6cd31e7fbca4e4e9e48edde242fb (diff)
parentee2b7db3f88f6882022a8aa71b30043ed8b40792 (diff)
downloadmariadb-git-a0fd7382bc1e4a8ba0affd27d3034f445a4bb453.tar.gz
Merge 10.0-base -> 10.0
Diffstat (limited to 'mysql-test/r/log_tables_upgrade.result')
-rw-r--r--mysql-test/r/log_tables_upgrade.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/log_tables_upgrade.result b/mysql-test/r/log_tables_upgrade.result
index 5afe4cf6ec2..5732b94a90c 100644
--- a/mysql-test/r/log_tables_upgrade.result
+++ b/mysql-test/r/log_tables_upgrade.result
@@ -24,6 +24,7 @@ mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
+mysql.gtid_slave_pos OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
@@ -38,7 +39,6 @@ mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
mysql.renamed_general_log OK
-mysql.rpl_slave_state OK
mysql.servers OK
mysql.slave_master_info OK
mysql.slave_relay_log_info OK