Commit d44e85e7 authored by unknown's avatar unknown
Browse files

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/psergey/mysql-5.0-bug9912
parents 2ea451e2 46385ce0

mysql-test/r/index_merge_ror.result

+3 −3
Original line number Diff line number Diff line
@@ -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

mysql-test/t/index_merge_ror.test

+1 −0
Original line number Diff line number Diff line
@@ -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';