Fixing test cases

Added missing system tables used in 5.6
2025-07-29 05:21:33 +03:00 · 2012-08-23 00:32:25 +03:00
parent f1159b18d9
commit f277f27ae2
67 changed files with 982 additions and 93 deletions
--- a/mysql-test/suite/funcs_1/t/is_basics_mixed.test
+++ b/mysql-test/suite/funcs_1/t/is_basics_mixed.test
@ -23,7 +23,7 @@
 #        - Can't create/write to file
 #          '.../var/master-data/information_schema/tables.frm~
 --source include/not_embedded.inc
-
+--source include/have_innodb.inc
 --source suite/funcs_1/datadict/datadict.pre

 # $engine_type must point to storage engine which is all time available.
--- a/mysql-test/suite/funcs_1/t/is_key_column_usage.test
+++ b/mysql-test/suite/funcs_1/t/is_key_column_usage.test
@ -16,4 +16,5 @@
 #

 --source include/not_embedded.inc
+--source include/have_innodb.inc
 --source suite/funcs_1/datadict/is_key_column_usage.inc
--- a/mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test
+++ b/mysql-test/suite/funcs_1/t/is_key_column_usage_embedded.test
@ -13,6 +13,7 @@
 # 2008-06-06 mleich Create this this variant for the embedded server.
 #

+--source include/have_innodb.inc
 if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
   --skip Test requires: embedded server
--- a/mysql-test/suite/funcs_1/t/is_statistics_mysql.test
+++ b/mysql-test/suite/funcs_1/t/is_statistics_mysql.test
@ -13,6 +13,7 @@
 #

 --source include/not_embedded.inc
+--source include/have_innodb.inc
 let $database = mysql;
 let $my_where = WHERE table_schema = 'mysql';
 --source suite/funcs_1/datadict/statistics.inc
--- a/mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test
+++ b/mysql-test/suite/funcs_1/t/is_statistics_mysql_embedded.test
@ -14,6 +14,7 @@ if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
   --skip Test requires: embedded server
 }
+--source include/have_innodb.inc
 let $database = mysql;
 let $my_where = WHERE table_schema = 'mysql';
 --source suite/funcs_1/datadict/statistics.inc
--- a/mysql-test/suite/funcs_1/t/is_table_constraints.test
+++ b/mysql-test/suite/funcs_1/t/is_table_constraints.test
@ -19,6 +19,7 @@
 # This test cannot be used for the embedded server because we check here
 # privileges.
 --source include/not_embedded.inc
+--source include/have_innodb.inc

 let $engine_type       = MyISAM;

--- a/mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test
+++ b/mysql-test/suite/funcs_1/t/is_table_constraints_mysql.test
@ -13,5 +13,6 @@
 #

 --source include/not_embedded.inc
+--source include/have_innodb.inc
 let $table_schema = mysql;
 --source suite/funcs_1/datadict/table_constraints.inc
--- a/mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test
+++ b/mysql-test/suite/funcs_1/t/is_table_constraints_mysql_embedded.test
@ -10,6 +10,7 @@
 # 2008-06-06 mleich Create this this variant for the embedded server.
 #

+--source include/have_innodb.inc
 if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
   --skip Test requires: embedded server
--- a/mysql-test/suite/funcs_1/t/is_tables_mysql.test
+++ b/mysql-test/suite/funcs_1/t/is_tables_mysql.test
@ -13,5 +13,6 @@
 #

 --source include/not_embedded.inc
+--source include/have_innodb.inc
 let $my_where = WHERE table_schema = 'mysql';
 --source suite/funcs_1/datadict/tables1.inc
--- a/mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test
+++ b/mysql-test/suite/funcs_1/t/is_tables_mysql_embedded.test
@ -10,6 +10,7 @@
 # 2008-06-06 mleich Create this this variant for the embedded server.
 #

+--source include/have_innodb.inc
 if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
   --skip Test requires: embedded server