summaryrefslogtreecommitdiff
path: root/mysql-test/include/index_merge1.inc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2019-02-14 15:23:23 -0800
committerIgor Babaev <igor@askmonty.org>2019-02-14 15:23:23 -0800
commitccce4d3be9bb5dfce66576f9744bcb927b754cf4 (patch)
tree6f66a954aed4f99ff06a215d2be603c9fa18c6b2 /mysql-test/include/index_merge1.inc
parente1de23b8d51c53b87a9d54352af0e99d4386e0ee (diff)
downloadmariadb-git-ccce4d3be9bb5dfce66576f9744bcb927b754cf4.tar.gz
MDEV-16188 Post review fixes
Also adjusted some test files.
Diffstat (limited to 'mysql-test/include/index_merge1.inc')
-rw-r--r--mysql-test/include/index_merge1.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/include/index_merge1.inc b/mysql-test/include/index_merge1.inc
index f2ef38f72f8..a5362b5c819 100644
--- a/mysql-test/include/index_merge1.inc
+++ b/mysql-test/include/index_merge1.inc
@@ -479,6 +479,7 @@ create table t2(
) ENGINE=MEMORY DEFAULT CHARSET=latin1;
insert into t2 select * from t1;
+
--echo must use sort-union rather than union:
--replace_column 9 #
explain select * from t1 where a=4 or b=4;
@@ -489,9 +490,9 @@ select * from t1 ignore index(a,b) where a=4 or b=4;
--echo must use union, not sort-union:
--replace_column 9 #
-explain select * from t2 where a=4 or b=4;
+explain select * from t2 where a=2 or b=2;
--sorted_result
-select * from t2 where a=4 or b=4;
+select * from t2 where a=2 or b=2;
drop table t1, t2;