Skip to content

M
MariaDB
Commit d8a81708 authored by Alexander Nozdrin's avatar Alexander Nozdrin
Browse files
Options

Merge from mysql-trunk-bugfixing.

parents 528ab7bb 019f5121
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
mysql-test/t/index_merge_innodb.test
View file @ d8a81708
...@@ -21,14 +21,10 @@ let $index_merge_random_rows_in_EXPLAIN = 1; ...@@ -21,14 +21,10 @@ let $index_merge_random_rows_in_EXPLAIN = 1;
# InnoDB does not support Merge tables (affects include/index_merge1.inc) # InnoDB does not support Merge tables (affects include/index_merge1.inc)
let $merge_table_support= 0; let $merge_table_support= 0;
# The first two tests are disabled because of non deterministic explain output. # -- [DISABLED Bug#45727]
# If include/index_merge1.inc can be enabled for InnoDB and all other
# storage engines, please remove the subtest for Bug#21277 from
# include/index_merge2.inc.
# This test exists already in include/index_merge1.inc.
# --source include/index_merge1.inc # --source include/index_merge1.inc
# --source include/index_merge_ror.inc # --source include/index_merge_ror.inc
# --source include/index_merge2.inc
--source include/index_merge2.inc
--source include/index_merge_2sweeps.inc --source include/index_merge_2sweeps.inc
--source include/index_merge_ror_cpk.inc --source include/index_merge_ror_cpk.inc
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7