diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-12-07 17:17:13 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-12-07 17:17:13 -0800 |
| commit | f960f2334dab6bef702a6f36e90dcdf6835588b6 (patch) | |
| tree | 2b5d4795848cbe96d8caec2e10fa2b0d74432858 /mysql-test/include/index_merge1.inc | |
| parent | adb9fd9578f61a73ae224ede3bcb7adef863c1e3 (diff) | |
| parent | c44c9207f05d06f8dd59bb23b6265a645b9e1102 (diff) | |
| download | mariadb-git-f960f2334dab6bef702a6f36e90dcdf6835588b6.tar.gz | |
Merge.
Diffstat (limited to 'mysql-test/include/index_merge1.inc')
| -rw-r--r-- | mysql-test/include/index_merge1.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/index_merge1.inc b/mysql-test/include/index_merge1.inc index d137b0957c0..b3e61802dcf 100644 --- a/mysql-test/include/index_merge1.inc +++ b/mysql-test/include/index_merge1.inc @@ -334,12 +334,12 @@ update t0 set key2=1, key3=1, key4=1, key5=1,key6=1,key7=1 where key7 < 500; --replace_column 9 # --replace_result "4,4,4,4,4,4,4" X "4,4,4,4,4,4" X "i6,i7" "i6,i7?" "i6" "i6,i7?" explain select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) - from t0 as A, t0 as B + from t0 as A straight_join t0 as B where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1) and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key7 = 1 or B.key8=1); select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4 + A.key5 + B.key5) - from t0 as A, t0 as B + from t0 as A straight_join t0 as B where (A.key1 = 1 and A.key2 = 1 and A.key3 = 1 and A.key4=1 and A.key5=1 and A.key6=1 and A.key7 = 1 or A.key8=1) and (B.key1 = 1 and B.key2 = 1 and B.key3 = 1 and B.key4=1 and B.key5=1 and B.key6=1 and B.key7 = 1 or B.key8=1); |