diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-04-12 14:51:03 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-04-12 14:51:03 +0200 |
| commit | 31ae09fcea3326f1c864c5f0e50f8f9727ce5d33 (patch) | |
| tree | c5b86e63193ae9094d2585357ab69f45d2aa2662 /mysql-test/t | |
| parent | 3135c9c01b4ff62ba06bb6d0ab286f25e9ba7087 (diff) | |
| parent | d1cf60d198db6703b66fb180b1ee3938862dabe1 (diff) | |
| download | mariadb-git-31ae09fcea3326f1c864c5f0e50f8f9727ce5d33.tar.gz | |
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
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/heap.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/heap_btree.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/heap_hash.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/range.test | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/t/heap.test b/mysql-test/t/heap.test index ca4a8beb527..68a84e1c193 100644 --- a/mysql-test/t/heap.test +++ b/mysql-test/t/heap.test @@ -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; diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test index d156d059634..6fec2ac1703 100644 --- a/mysql-test/t/heap_btree.test +++ b/mysql-test/t/heap_btree.test @@ -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 using BTREE (a); select * from t1 where a > 736494; diff --git a/mysql-test/t/heap_hash.test b/mysql-test/t/heap_hash.test index 6d27f19dfad..46669dd2b8f 100644 --- a/mysql-test/t/heap_hash.test +++ b/mysql-test/t/heap_hash.test @@ -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 using HASH (a); select * from t1 where a > 736494; diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test index 18cf614f338..16be850548c 100644 --- a/mysql-test/t/range.test +++ b/mysql-test/t/range.test @@ -198,7 +198,7 @@ drop table t1; # bug #1172: "Force index" option caused server crash # 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; |