summaryrefslogtreecommitdiff
path: root/mysql-test/include/index_merge2.inc
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2009-11-14 02:15:03 +0100
committerunknown <knielsen@knielsen-hq.org>2009-11-14 02:15:03 +0100
commit8fdb7d0e96debbf2baaf425ba88a1b85ba764695 (patch)
tree63f5fc50cda9a989db1c04af94c29399cae7d8c1 /mysql-test/include/index_merge2.inc
parentc79b397faa836a0189b5a9ef3e9c6a626e3f3477 (diff)
downloadmariadb-git-8fdb7d0e96debbf2baaf425ba88a1b85ba764695.tar.gz
XtraDB 8 after-merge fixes: fix forgotten manual merge of patch file.
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 d65115eac0f..32a176630ad 100644
--- a/mysql-test/include/index_merge2.inc
+++ b/mysql-test/include/index_merge2.inc
@@ -122,12 +122,14 @@ insert into t1 (key1a, key1b, key2a, key2b, key3a, key3b)
analyze table t1;
select count(*) from t1;
+--replace_column 9 REF
explain select count(*) from t1 where
key1a = 2 and key1b is null and key2a = 2 and key2b is null;
select count(*) from t1 where
key1a = 2 and key1b is null and key2a = 2 and key2b is null;
+--replace_column 9 REF
explain select count(*) from t1 where
key1a = 2 and key1b is null and key3a = 2 and key3b is null;