diff options
author | Michael Widenius <monty@askmonty.org> | 2012-08-23 00:32:25 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-08-23 00:32:25 +0300 |
commit | f277f27ae2fb4ab45a014027f08093a28acc1c14 (patch) | |
tree | e8e1c9bd3f005871e29b35d7383d843f446645f9 /mysql-test/t/system_mysql_db_fix50030.test | |
parent | f1159b18d930910d5b5b9c454a17b0ee66f853c3 (diff) | |
download | mariadb-git-f277f27ae2fb4ab45a014027f08093a28acc1c14.tar.gz |
Fixing test cases
Added missing system tables used in 5.6
Diffstat (limited to 'mysql-test/t/system_mysql_db_fix50030.test')
-rw-r--r-- | mysql-test/t/system_mysql_db_fix50030.test | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/t/system_mysql_db_fix50030.test b/mysql-test/t/system_mysql_db_fix50030.test index e8cfe6a6cf3..be3a54fdfec 100644 --- a/mysql-test/t/system_mysql_db_fix50030.test +++ b/mysql-test/t/system_mysql_db_fix50030.test @@ -1,5 +1,6 @@ # Embedded server doesn't support external clients --source include/not_embedded.inc +--source include/have_innodb.inc # Don't run this test if $MYSQL_FIX_PRIVILEGE_TABLES isn't set # to the location of mysql_fix_privilege_tables.sql @@ -67,7 +68,7 @@ CREATE TABLE servers ( Server_name char(64) NOT NULL DEFAULT '', Host char(64) N INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','root'); # Run the mysql_fix_privilege_tables.sql using "mysql --force" ---exec $MYSQL --force test < $MYSQL_FIX_PRIVILEGE_TABLES +--exec $MYSQL --force test < $MYSQL_FIX_PRIVILEGE_TABLES > $MYSQLTEST_VARDIR/log/system_mysql_db_fix50030.log 2>&1 -- enable_query_log -- enable_result_log @@ -78,7 +79,7 @@ INSERT INTO servers VALUES ('test','localhost','test','root','', 0,'','mysql','r -- disable_query_log # Drop all tables created by this test -DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv; +DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, servers, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, ndb_binlog_index, proxies_priv, slave_master_info, slave_relay_log_info, innodb_index_stats, innodb_table_stats, slave_worker_info; -- enable_query_log |