Commit 378c506d authored by unknown's avatar unknown
Browse files

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

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/r/heap.result:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
parents 79c62d31 5b5a1239

mysql-test/r/heap.result

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ a b 
4	4

drop table t1;

create table t1 (a int not null) engine=heap;

insert into t1 values (869751),(736494),(226312),(802616);

insert into t1 values (869751),(736494),(226312),(802616),(728912);

select * from t1 where a > 736494;

a

869751
@@ -66,7 +66,7 @@ a 
alter table t1 engine=myisam;

explain select * from t1 where a in (869751,736494,226312,802616);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	uniq_id	uniq_id	4	NULL	4	Using where; Using index

1	SIMPLE	t1	range	uniq_id	uniq_id	4	NULL	4	Using where; Using index

drop table t1;

create table t1 (x int not null, y int not null, key x (x), unique y (y))

engine=heap;

mysql-test/r/heap_btree.result

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ a b 
4	4

drop table t1;

create table t1 (a int not null) engine=heap;

insert into t1 values (869751),(736494),(226312),(802616);

insert into t1 values (869751),(736494),(226312),(802616),(728912);

select * from t1 where a > 736494;

a

869751
@@ -66,7 +66,7 @@ a 
alter table t1 engine=myisam;

explain select * from t1 where a in (869751,736494,226312,802616);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	uniq_id	uniq_id	4	NULL	4	Using where; Using index

1	SIMPLE	t1	range	uniq_id	uniq_id	4	NULL	4	Using where; Using index

drop table t1;

create table t1 (x int not null, y int not null, key x  using BTREE (x,y), unique y  using BTREE (y))

engine=heap;

mysql-test/r/heap_hash.result

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ a b 
4	4

drop table t1;

create table t1 (a int not null) engine=heap;

insert into t1 values (869751),(736494),(226312),(802616);

insert into t1 values (869751),(736494),(226312),(802616),(728912);

select * from t1 where a > 736494;

a

869751
@@ -66,7 +66,7 @@ a 
alter table t1 engine=myisam;

explain select * from t1 where a in (869751,736494,226312,802616);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	uniq_id	uniq_id	4	NULL	4	Using where; Using index

1	SIMPLE	t1	range	uniq_id	uniq_id	4	NULL	4	Using where; Using index

drop table t1;

create table t1 (x int not null, y int not null, key x  using HASH (x), unique y  using HASH (y))

engine=heap;

mysql-test/r/range.result

+3 −3
Original line number Diff line number Diff line
@@ -250,18 +250,18 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t1	index	x	x	5	NULL	9	Using where; Using index

drop table t1;

CREATE TABLE t1 (key1 int(11) NOT NULL default '0', KEY i1 (key1));

INSERT INTO t1 VALUES (0),(0),(1),(1);

INSERT INTO t1 VALUES (0),(1),(1);

CREATE TABLE t2 (keya int(11) NOT NULL default '0', KEY j1 (keya));

INSERT INTO t2 VALUES (0),(0),(1),(1),(2),(2);

explain select * from t1, t2 where (t1.key1 <t2.keya + 1) and t2.keya=3;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	j1	j1	4	const	1	Using index

1	SIMPLE	t1	index	i1	i1	4	NULL	4	Using where; Using index

1	SIMPLE	t1	index	i1	i1	4	NULL	3	Using where; Using index

explain select * from t1 force index(i1), t2 force index(j1) where 

(t1.key1 <t2.keya + 1) and t2.keya=3;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	j1	j1	4	const	1	Using index

1	SIMPLE	t1	index	i1	i1	4	NULL	4	Using where; Using index

1	SIMPLE	t1	index	i1	i1	4	NULL	3	Using where; Using index

DROP TABLE t1,t2;

CREATE TABLE t1 (

a int(11) default NULL,

mysql-test/t/heap.test

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ select * from t1; 
drop table t1;



create table t1 (a int not null) engine=heap;

insert into t1 values (869751),(736494),(226312),(802616);

insert into t1 values (869751),(736494),(226312),(802616),(728912);

select * from t1 where a > 736494;

alter table t1 add unique uniq_id(a);

select * from t1 where a > 736494;