summaryrefslogtreecommitdiff
path: root/mysql-test/include/index_merge2.inc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-12-10 23:23:34 -0800
committerIgor Babaev <igor@askmonty.org>2010-12-10 23:23:34 -0800
commit7f52af655a04c4fecfe32bede79bd65cac0e043d (patch)
tree071fe4a63bdce21ee8a0a6cfe5e7aa4b3b26f354 /mysql-test/include/index_merge2.inc
parenteb70e64ceaa7aec6a35580643a3e5fc01b6a0630 (diff)
parent4e05898f539f299bbb12c49834502c1e471f2fc9 (diff)
downloadmariadb-git-7f52af655a04c4fecfe32bede79bd65cac0e043d.tar.gz
Merge.
Diffstat (limited to 'mysql-test/include/index_merge2.inc')
-rw-r--r--mysql-test/include/index_merge2.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/include/index_merge2.inc b/mysql-test/include/index_merge2.inc
index 566e151dc7f..6b0623bdd5f 100644
--- a/mysql-test/include/index_merge2.inc
+++ b/mysql-test/include/index_merge2.inc
@@ -123,6 +123,7 @@ analyze table t1;
select count(*) from t1;
--replace_column 9 REF
+--replace_result i2,i1 i1,i2
explain select count(*) from t1 where
key1a = 2 and key1b is null and key2a = 2 and key2b is null;
@@ -130,6 +131,7 @@ select count(*) from t1 where
key1a = 2 and key1b is null and key2a = 2 and key2b is null;
--replace_column 9 REF
+--replace_result i3,i1 i1,i3
explain select count(*) from t1 where
key1a = 2 and key1b is null and key3a = 2 and key3b is null;