Commit 0669d1e0 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-bug13455


mysql-test/r/innodb.result:
  Auto merged
parents 11d9e4b6 8bdb41ab

mysql-test/r/heap.result

+4 −4
Original line number Diff line number Diff line
@@ -379,10 +379,10 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	ALL	v	NULL	NULL	NULL	271	Using where

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	v	NULL	NULL	NULL	271	Using where

1	SIMPLE	t1	ref	v	v	13	const	10	Using where

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	v	NULL	NULL	NULL	271	Using where

1	SIMPLE	t1	ref	v	v	13	const	10	Using where

alter table t1 add unique(v);

ERROR 23000: Duplicate entry '{ ' for key 1

select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a' order by length(concat('*',v,'*',c,'*',t,'*'));
@@ -602,10 +602,10 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	range	v	v	13	NULL	#	Using where

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	13	NULL	#	Using where

1	SIMPLE	t1	ref	v	v	13	const	#	Using where

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	13	NULL	#	Using where

1	SIMPLE	t1	ref	v	v	13	const	#	Using where

alter table t1 add unique(v);

ERROR 23000: Duplicate entry '{ ' for key 1

select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a' order by length(concat('*',v,'*',c,'*',t,'*'));

mysql-test/r/innodb.result

+6 −6
Original line number Diff line number Diff line
@@ -1997,10 +1997,10 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	range	v	v	13	NULL	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	13	NULL	#	Using where; Using index

1	SIMPLE	t1	ref	v	v	13	const	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	13	NULL	#	Using where; Using index

1	SIMPLE	t1	ref	v	v	13	const	#	Using where; Using index

alter table t1 add unique(v);

ERROR 23000: Duplicate entry '{ ' for key 1

alter table t1 add key(v);
@@ -2188,10 +2188,10 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	range	v	v	303	NULL	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	303	NULL	#	Using where; Using index

1	SIMPLE	t1	ref	v	v	303	const	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	303	NULL	#	Using where; Using index

1	SIMPLE	t1	ref	v	v	303	const	#	Using where; Using index

explain select * from t1 where v='a';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	303	const	#	Using where
@@ -2268,10 +2268,10 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	range	v	v	33	NULL	#	Using where

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	33	NULL	#	Using where

1	SIMPLE	t1	ref	v	v	33	const	#	Using where

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	33	NULL	#	Using where

1	SIMPLE	t1	ref	v	v	33	const	#	Using where

explain select * from t1 where v='a';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	33	const	#	Using where

mysql-test/r/myisam.result

+6 −6
Original line number Diff line number Diff line
@@ -802,10 +802,10 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	range	v	v	13	NULL	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	13	NULL	#	Using where; Using index

1	SIMPLE	t1	ref	v	v	13	const	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	13	NULL	#	Using where; Using index

1	SIMPLE	t1	ref	v	v	13	const	#	Using where; Using index

alter table t1 add unique(v);

ERROR 23000: Duplicate entry '{ ' for key 1

alter table t1 add key(v);
@@ -993,10 +993,10 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	range	v	v	303	NULL	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	303	NULL	#	Using where; Using index

1	SIMPLE	t1	ref	v	v	303	const	#	Using where; Using index

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	303	NULL	#	Using where; Using index

1	SIMPLE	t1	ref	v	v	303	const	#	Using where; Using index

explain select * from t1 where v='a';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	303	const	#	Using where
@@ -1073,10 +1073,10 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	range	v	v	33	NULL	#	Using where

explain select count(*) from t1 where v between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	33	NULL	#	Using where

1	SIMPLE	t1	ref	v	v	33	const	#	Using where

explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	v	v	33	NULL	#	Using where

1	SIMPLE	t1	ref	v	v	33	const	#	Using where

explain select * from t1 where v='a';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	v	v	33	const	#	Using where

mysql-test/r/range.result

+24 −1
Original line number Diff line number Diff line 
drop table if exists t1, t2;

drop table if exists t1, t2, t3;

CREATE TABLE t1 (

event_date date DEFAULT '0000-00-00' NOT NULL,

type int(11) DEFAULT '0' NOT NULL,
@@ -787,3 +787,26 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	PRIMARY	t1	range	PRIMARY	PRIMARY	8	NULL	#	Using where; Using index

drop view v1;

drop table t1;

create table t3 (a int);

insert into t3 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);

create table t1 (a varchar(10), filler char(200), key(a)) charset=binary;

insert into t1 values ('a','');

insert into t1 values ('a ','');

insert into t1 values ('a  ', '');

insert into t1 select concat('a', 1000 + A.a + 10 * (B.a + 10 * C.a)), ''

  from t3 A, t3 B, t3 C;

create table t2 (a varchar(10), filler char(200), key(a));

insert into t2 select * from t1;

explain select * from t1 where a between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	a	a	13	NULL	#	Using where

explain select * from t1 where a = 'a' or a='a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	a	a	13	NULL	#	Using where

explain select * from t2 where a between 'a' and 'a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	a	a	13	const	#	Using where

explain select * from t2 where a = 'a' or a='a ';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	a	a	13	const	#	Using where

drop table t1,t2,t3;

mysql-test/t/range.test

+27 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



--disable_warnings

drop table if exists t1, t2;

drop table if exists t1, t2, t3;

--enable_warnings



CREATE TABLE t1 (
@@ -600,3 +600,29 @@ explain select * from v1 where a between 3 and 4 and b between 1 and 2; 
 

drop view v1;

drop table t1;



# BUG#13455: 

create table t3 (a int);

insert into t3 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);



create table t1 (a varchar(10), filler char(200), key(a)) charset=binary;

insert into t1 values ('a','');

insert into t1 values ('a ','');

insert into t1 values ('a  ', '');

insert into t1 select concat('a', 1000 + A.a + 10 * (B.a + 10 * C.a)), ''

  from t3 A, t3 B, t3 C;



create table t2 (a varchar(10), filler char(200), key(a));

insert into t2 select * from t1;



--replace_column 9 #

explain select * from t1 where a between 'a' and 'a '; 

--replace_column 9 #

explain select * from t1 where a = 'a' or a='a ';



--replace_column 9 #

explain select * from t2 where a between 'a' and 'a '; 

--replace_column 9 #

explain select * from t2 where a = 'a' or a='a ';



drop table t1,t2,t3;