summaryrefslogtreecommitdiff
path: root/mysql-test/t/index_merge_innodb.test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-12-27 19:40:07 +0100
committerSergei Golubchik <serg@mariadb.org>2016-12-29 13:23:49 +0100
commitab89359dde2f8fce2f1b7d233587804f459b9348 (patch)
tree46e5a7ecc8da4e48592720fd019c95fb557f051c /mysql-test/t/index_merge_innodb.test
parentb3d6cbc25a14cc73c5844b051d76f8967c653121 (diff)
downloadmariadb-git-ab89359dde2f8fce2f1b7d233587804f459b9348.tar.gz
enable tests that were skipped because of have_xtradb
* some of these tests run just fine with InnoDB: -> s/have_xtradb/have_innodb/ * sys_var tests did basic tests for xtradb only variables -> remove them, they're useless anyway (sysvar_innodb does it better) * multi_update had innodb specific tests -> move to multi_update_innodb.test
Diffstat (limited to 'mysql-test/t/index_merge_innodb.test')
-rw-r--r--mysql-test/t/index_merge_innodb.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/index_merge_innodb.test b/mysql-test/t/index_merge_innodb.test
index 6a1cb53dc40..3a2601342ba 100644
--- a/mysql-test/t/index_merge_innodb.test
+++ b/mysql-test/t/index_merge_innodb.test
@@ -12,7 +12,7 @@
# Slow test, don't run during staging part
--source include/not_staging.inc
---source include/have_xtradb.inc
+--source include/have_innodb.inc
let $engine_type= InnoDB;
# InnoDB does not support Merge tables (affects include/index_merge1.inc)