summaryrefslogtreecommitdiff
path: root/mysql-test/r/log_tables_upgrade.result
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2013-07-05 10:21:15 +0400
committerSergey Petrunya <psergey@askmonty.org>2013-07-05 10:21:15 +0400
commit4a8c61f372c808cd14e9ec2ce0b063f58345e8ba (patch)
treed9de9e1ecc6adf68cdb63f54290b2c72da59c28d /mysql-test/r/log_tables_upgrade.result
parent87990b62be413e3b95a7524e4c690b3c55f46b89 (diff)
downloadmariadb-git-4a8c61f372c808cd14e9ec2ce0b063f58345e8ba.tar.gz
Fix a number of tests:
- MariaDB does not have mysql.slave_master_info, mysql.slave_relay_log_info ,mysql.slave_worker_info or mysql.ndb_binlog_index tables. - Some tests expected to have these tables (this was an incorrect merge from 5.6, which merged necessary tables like mysql.innodb*stats, but also got these tables)
Diffstat (limited to 'mysql-test/r/log_tables_upgrade.result')
-rw-r--r--mysql-test/r/log_tables_upgrade.result4
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/r/log_tables_upgrade.result b/mysql-test/r/log_tables_upgrade.result
index 7aced367991..fbaad9d101c 100644
--- a/mysql-test/r/log_tables_upgrade.result
+++ b/mysql-test/r/log_tables_upgrade.result
@@ -32,16 +32,12 @@ mysql.host OK
mysql.index_stats OK
mysql.innodb_index_stats OK
mysql.innodb_table_stats OK
-mysql.ndb_binlog_index OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.proxies_priv OK
mysql.renamed_general_log OK
mysql.servers OK
-mysql.slave_master_info OK
-mysql.slave_relay_log_info OK
-mysql.slave_worker_info OK
mysql.table_stats OK
mysql.tables_priv OK
mysql.time_zone OK