bk commit into 5.0 tree (sergefp:1.1864) BUG#9912

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1864 05/04/21 13:32:46 sergefp@stripped +2 -0
  Fix for BUG#9912: make the test handle both possible optimizer choices

  mysql-test/t/index_merge_ror.test
    1.4 05/04/21 13:32:43 sergefp@stripped +1 -0
    Fix for BUG#9912: make the test handle both possible optimizer choices

  mysql-test/r/index_merge_ror.result
    1.5 05/04/21 13:32:43 sergefp@stripped +3 -3
    Fix for BUG#9912: make the test handle both possible optimizer choices

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-bug9912

--- 1.4/mysql-test/r/index_merge_ror.result	2004-09-09 07:59:20 +04:00
+++ 1.5/mysql-test/r/index_merge_ror.result	2005-04-21 13:32:43 +04:00
@@ -180,9 +180,9 @@
 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

--- 1.3/mysql-test/t/index_merge_ror.test	2005-01-14 05:57:55 +03:00
+++ 1.4/mysql-test/t/index_merge_ror.test	2005-04-21 13:32:43 +04:00
@@ -240,6 +240,7 @@
 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';