Skip to content

Commit a1c4918

Browse files
author
msvensson@neptunus.(none)
committed
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2 parents 480063e + 7387030 commit a1c4918

8 files changed

+13
-13
lines changed

‎mysql-test/r/heap.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ a b
4040
4 4
4141
drop table t1;
4242
create table t1 (a int not null) engine=heap;
43-
insert into t1 values (869751),(736494),(226312),(802616);
43+
insert into t1 values (869751),(736494),(226312),(802616),(728912);
4444
select * from t1 where a > 736494;
4545
a
4646
869751
@@ -66,7 +66,7 @@ a
6666
alter table t1 engine=myisam;
6767
explain select * from t1 where a in (869751,736494,226312,802616);
6868
id select_type table type possible_keys key key_len ref rows Extra
69-
1 SIMPLE t1 index uniq_id uniq_id 4 NULL 4 Using where; Using index
69+
1 SIMPLE t1 range uniq_id uniq_id 4 NULL 4 Using where; Using index
7070
drop table t1;
7171
create table t1 (x int not null, y int not null, key x (x), unique y (y))
7272
engine=heap;

‎mysql-test/r/heap_btree.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ a b
4040
4 4
4141
drop table t1;
4242
create table t1 (a int not null) engine=heap;
43-
insert into t1 values (869751),(736494),(226312),(802616);
43+
insert into t1 values (869751),(736494),(226312),(802616),(728912);
4444
select * from t1 where a > 736494;
4545
a
4646
869751
@@ -66,7 +66,7 @@ a
6666
alter table t1 engine=myisam;
6767
explain select * from t1 where a in (869751,736494,226312,802616);
6868
id select_type table type possible_keys key key_len ref rows Extra
69-
1 SIMPLE t1 index uniq_id uniq_id 4 NULL 4 Using where; Using index
69+
1 SIMPLE t1 range uniq_id uniq_id 4 NULL 4 Using where; Using index
7070
drop table t1;
7171
create table t1 (x int not null, y int not null, key x using BTREE (x,y), unique y using BTREE (y))
7272
engine=heap;

‎mysql-test/r/heap_hash.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ a b
4040
4 4
4141
drop table t1;
4242
create table t1 (a int not null) engine=heap;
43-
insert into t1 values (869751),(736494),(226312),(802616);
43+
insert into t1 values (869751),(736494),(226312),(802616),(728912);
4444
select * from t1 where a > 736494;
4545
a
4646
869751
@@ -66,7 +66,7 @@ a
6666
alter table t1 engine=myisam;
6767
explain select * from t1 where a in (869751,736494,226312,802616);
6868
id select_type table type possible_keys key key_len ref rows Extra
69-
1 SIMPLE t1 index uniq_id uniq_id 4 NULL 4 Using where; Using index
69+
1 SIMPLE t1 range uniq_id uniq_id 4 NULL 4 Using where; Using index
7070
drop table t1;
7171
create table t1 (x int not null, y int not null, key x using HASH (x), unique y using HASH (y))
7272
engine=heap;

‎mysql-test/r/range.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,18 +250,18 @@ id select_type table type possible_keys key key_len ref rows Extra
250250
1 SIMPLE t1 index x x 5 NULL 9 Using where; Using index
251251
drop table t1;
252252
CREATE TABLE t1 (key1 int(11) NOT NULL default '0', KEY i1 (key1));
253-
INSERT INTO t1 VALUES (0),(0),(1),(1);
253+
INSERT INTO t1 VALUES (0),(1),(1);
254254
CREATE TABLE t2 (keya int(11) NOT NULL default '0', KEY j1 (keya));
255255
INSERT INTO t2 VALUES (0),(0),(1),(1),(2),(2);
256256
explain select * from t1, t2 where (t1.key1 <t2.keya + 1) and t2.keya=3;
257257
id select_type table type possible_keys key key_len ref rows Extra
258258
1 SIMPLE t2 ref j1 j1 4 const 1 Using index
259-
1 SIMPLE t1 index i1 i1 4 NULL 4 Using where; Using index
259+
1 SIMPLE t1 index i1 i1 4 NULL 3 Using where; Using index
260260
explain select * from t1 force index(i1), t2 force index(j1) where
261261
(t1.key1 <t2.keya + 1) and t2.keya=3;
262262
id select_type table type possible_keys key key_len ref rows Extra
263263
1 SIMPLE t2 ref j1 j1 4 const 1 Using index
264-
1 SIMPLE t1 index i1 i1 4 NULL 4 Using where; Using index
264+
1 SIMPLE t1 index i1 i1 4 NULL 3 Using where; Using index
265265
DROP TABLE t1,t2;
266266
CREATE TABLE t1 (
267267
a int(11) default NULL,

‎mysql-test/t/heap.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ select * from t1;
3434
drop table t1;
3535

3636
create table t1 (a int not null) engine=heap;
37-
insert into t1 values (869751),(736494),(226312),(802616);
37+
insert into t1 values (869751),(736494),(226312),(802616),(728912);
3838
select * from t1 where a > 736494;
3939
alter table t1 add unique uniq_id(a);
4040
select * from t1 where a > 736494;

‎mysql-test/t/heap_btree.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ select * from t1;
3434
drop table t1;
3535

3636
create table t1 (a int not null) engine=heap;
37-
insert into t1 values (869751),(736494),(226312),(802616);
37+
insert into t1 values (869751),(736494),(226312),(802616),(728912);
3838
select * from t1 where a > 736494;
3939
alter table t1 add unique uniq_id using BTREE (a);
4040
select * from t1 where a > 736494;

‎mysql-test/t/heap_hash.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ select * from t1;
3434
drop table t1;
3535

3636
create table t1 (a int not null) engine=heap;
37-
insert into t1 values (869751),(736494),(226312),(802616);
37+
insert into t1 values (869751),(736494),(226312),(802616),(728912);
3838
select * from t1 where a > 736494;
3939
alter table t1 add unique uniq_id using HASH (a);
4040
select * from t1 where a > 736494;

‎mysql-test/t/range.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ drop table t1;
198198
# bug #1172: "Force index" option caused server crash
199199
#
200200
CREATE TABLE t1 (key1 int(11) NOT NULL default '0', KEY i1 (key1));
201-
INSERT INTO t1 VALUES (0),(0),(1),(1);
201+
INSERT INTO t1 VALUES (0),(1),(1);
202202
CREATE TABLE t2 (keya int(11) NOT NULL default '0', KEY j1 (keya));
203203
INSERT INTO t2 VALUES (0),(0),(1),(1),(2),(2);
204204
explain select * from t1, t2 where (t1.key1 <t2.keya + 1) and t2.keya=3;

0 commit comments

Comments
 (0)