From 46385ce0855e3d8aba65486206a2e06536f3cf68 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 21 Apr 2005 13:32:46 +0400 Subject: [PATCH] Fix for BUG#9912: make the test handle both possible optimizer choices --- mysql-test/r/index_merge_ror.result | 6 +++--- mysql-test/t/index_merge_ror.test | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mysql-test/r/index_merge_ror.result b/mysql-test/r/index_merge_ror.result index 6fc9dddef88..a1d306c3ea4 100644 --- a/mysql-test/r/index_merge_ror.result +++ b/mysql-test/r/index_merge_ror.result @@ -180,9 +180,9 @@ count(a) select count(a) from t2 where b='BBBBBBBB'; count(a) 4 -explain select count(a) from t2 where a='AAAAAAAA' and b='AAAAAAAA'; -id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t2 ref a,b a 6 const 4 Using where +expla_or_bin select count(a_or_b) from t2 where a_or_b='AAAAAAAA' a_or_bnd a_or_b='AAAAAAAA'; +id select_type ta_or_ba_or_ble type possia_or_ble_keys key key_len ref rows Extra_or_b +1 SIMPLE t2 ref a_or_b,a_or_b a_or_b 6 const 4 Using where select count(a) from t2 where a='AAAAAAAA' and b='AAAAAAAA'; count(a) 4 diff --git a/mysql-test/t/index_merge_ror.test b/mysql-test/t/index_merge_ror.test index 5375f9d1a31..3a484157267 100644 --- a/mysql-test/t/index_merge_ror.test +++ b/mysql-test/t/index_merge_ror.test @@ -240,6 +240,7 @@ select count(a) from t2 where a='BBBBBBBB'; select count(a) from t2 where b='BBBBBBBB'; # BUG#1: +--replace_result a a_or_b b a_or_b explain select count(a) from t2 where a='AAAAAAAA' and b='AAAAAAAA'; select count(a) from t2 where a='AAAAAAAA' and b='AAAAAAAA'; select count(a) from t2 ignore index(a,b) where a='AAAAAAAA' and b='AAAAAAAA';