summaryrefslogtreecommitdiff
path: root/mysql-test/include/have_innodb.inc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-11-09 20:51:11 +0100
committerSergei Golubchik <serg@mariadb.org>2017-11-09 20:51:11 +0100
commitc97a7cdbd04e73fda85207b8ca8238ed1f7508c9 (patch)
tree02dc64b9d2a15124b9a3895f02186ae53b02969e /mysql-test/include/have_innodb.inc
parent7ec6c6fa6262c91eb0f9cf907651a53d760fb275 (diff)
downloadmariadb-git-c97a7cdbd04e73fda85207b8ca8238ed1f7508c9.tar.gz
remove redundant tests from mysql-test/include/*.inc files
Some tests are skipped by checks in suite.pm. It is redundant to have an sql-level run-time check in the .inc file itself. In some cases it's not only redundant, but dangerous. After one bug in 10.2 innodb.create_isl_with_direct failed to start InnoDB, but the server started fine (just without InnoDB) and instead of failing, the test was skipped by run-time check in have_innodb.inc. # Conflicts: # mysql-test/include/not_embedded.inc # mysql-test/r/change_user_notembedded.result # mysql-test/suite.pm # mysql-test/t/change_user_notembedded.test
Diffstat (limited to 'mysql-test/include/have_innodb.inc')
-rw-r--r--mysql-test/include/have_innodb.inc6
1 files changed, 0 insertions, 6 deletions
diff --git a/mysql-test/include/have_innodb.inc b/mysql-test/include/have_innodb.inc
index 021970423cd..b89797d5828 100644
--- a/mysql-test/include/have_innodb.inc
+++ b/mysql-test/include/have_innodb.inc
@@ -2,9 +2,3 @@
# suite.pm will make sure that all tests including this file
# will be skipped unless innodb or xtradb is enabled
#
-# The test below is redundant
-
-if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'innodb' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
-{
- --skip Test requires InnoDB.
-}