Skip to content

M
MariaDB
Commit a1c4918a authored by msvensson@neptunus.(none)'s avatar msvensson@neptunus.(none)
Browse files
Options

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

into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents 480063e0 7387030e
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
mysql-test/r/heap.result
View file @ a1c4918a
...@@ -40,7 +40,7 @@ a b ...@@ -40,7 +40,7 @@ a b
4 4 4 4
drop table t1; drop table t1;
create table t1 (a int not null) engine=heap; 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; select * from t1 where a > 736494;
a a
869751 869751
...@@ -66,7 +66,7 @@ a ...@@ -66,7 +66,7 @@ a
alter table t1 engine=myisam; alter table t1 engine=myisam;
explain select * from t1 where a in (869751,736494,226312,802616); explain select * from t1 where a in (869751,736494,226312,802616);
id select_type table type possible_keys key key_len ref rows Extra 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; drop table t1;
create table t1 (x int not null, y int not null, key x (x), unique y (y)) create table t1 (x int not null, y int not null, key x (x), unique y (y))
engine=heap; engine=heap;
......
mysql-test/r/heap_btree.result
View file @ a1c4918a
...@@ -40,7 +40,7 @@ a b ...@@ -40,7 +40,7 @@ a b
4 4 4 4
drop table t1; drop table t1;
create table t1 (a int not null) engine=heap; 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; select * from t1 where a > 736494;
a a
869751 869751
...@@ -66,7 +66,7 @@ a ...@@ -66,7 +66,7 @@ a
alter table t1 engine=myisam; alter table t1 engine=myisam;
explain select * from t1 where a in (869751,736494,226312,802616); explain select * from t1 where a in (869751,736494,226312,802616);
id select_type table type possible_keys key key_len ref rows Extra 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; 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)) create table t1 (x int not null, y int not null, key x using BTREE (x,y), unique y using BTREE (y))
engine=heap; engine=heap;
......
mysql-test/r/heap_hash.result
View file @ a1c4918a
...@@ -40,7 +40,7 @@ a b ...@@ -40,7 +40,7 @@ a b
4 4 4 4
drop table t1; drop table t1;
create table t1 (a int not null) engine=heap; 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; select * from t1 where a > 736494;
a a
869751 869751
...@@ -66,7 +66,7 @@ a ...@@ -66,7 +66,7 @@ a
alter table t1 engine=myisam; alter table t1 engine=myisam;
explain select * from t1 where a in (869751,736494,226312,802616); explain select * from t1 where a in (869751,736494,226312,802616);
id select_type table type possible_keys key key_len ref rows Extra 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; drop table t1;
create table t1 (x int not null, y int not null, key x using HASH (x), unique y using HASH (y)) create table t1 (x int not null, y int not null, key x using HASH (x), unique y using HASH (y))
engine=heap; engine=heap;
......
mysql-test/r/range.result
View file @ a1c4918a
...@@ -250,18 +250,18 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -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 1 SIMPLE t1 index x x 5 NULL 9 Using where; Using index
drop table t1; drop table t1;
CREATE TABLE t1 (key1 int(11) NOT NULL default '0', KEY i1 (key1)); 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)); CREATE TABLE t2 (keya int(11) NOT NULL default '0', KEY j1 (keya));
INSERT INTO t2 VALUES (0),(0),(1),(1),(2),(2); 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; 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 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 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 explain select * from t1 force index(i1), t2 force index(j1) where
(t1.key1 <t2.keya + 1) and t2.keya=3; (t1.key1 <t2.keya + 1) and t2.keya=3;
id select_type table type possible_keys key key_len ref rows Extra 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 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; DROP TABLE t1,t2;
CREATE TABLE t1 ( CREATE TABLE t1 (
a int(11) default NULL, a int(11) default NULL,
......
mysql-test/t/heap.test
View file @ a1c4918a
...@@ -34,7 +34,7 @@ select * from t1; ...@@ -34,7 +34,7 @@ select * from t1;
drop table t1; drop table t1;
create table t1 (a int not null) engine=heap; 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; select * from t1 where a > 736494;
alter table t1 add unique uniq_id(a); alter table t1 add unique uniq_id(a);
select * from t1 where a > 736494; select * from t1 where a > 736494;
......
mysql-test/t/heap_btree.test
View file @ a1c4918a
...@@ -34,7 +34,7 @@ select * from t1; ...@@ -34,7 +34,7 @@ select * from t1;
drop table t1; drop table t1;
create table t1 (a int not null) engine=heap; 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; select * from t1 where a > 736494;
alter table t1 add unique uniq_id using BTREE (a); alter table t1 add unique uniq_id using BTREE (a);
select * from t1 where a > 736494; select * from t1 where a > 736494;
......
mysql-test/t/heap_hash.test
View file @ a1c4918a
...@@ -34,7 +34,7 @@ select * from t1; ...@@ -34,7 +34,7 @@ select * from t1;
drop table t1; drop table t1;
create table t1 (a int not null) engine=heap; 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; select * from t1 where a > 736494;
alter table t1 add unique uniq_id using HASH (a); alter table t1 add unique uniq_id using HASH (a);
select * from t1 where a > 736494; select * from t1 where a > 736494;
......
mysql-test/t/range.test
View file @ a1c4918a
...@@ -198,7 +198,7 @@ drop table t1; ...@@ -198,7 +198,7 @@ drop table t1;
# bug #1172: "Force index" option caused server crash # bug #1172: "Force index" option caused server crash
# #
CREATE TABLE t1 (key1 int(11) NOT NULL default '0', KEY i1 (key1)); 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)); CREATE TABLE t2 (keya int(11) NOT NULL default '0', KEY j1 (keya));
INSERT INTO t2 VALUES (0),(0),(1),(1),(2),(2); 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; explain select * from t1, t2 where (t1.key1 <t2.keya + 1) and t2.keya=3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7