diff options
author | unknown <serg@serg.mysql.com> | 2002-08-31 20:42:41 +0000 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2002-08-31 20:42:41 +0000 |
commit | 3f363c7d4d04e9fda8fdf7b0ac99c369045e687c (patch) | |
tree | a02394af922b23a01c59b08ddac8cd6c519d08c3 /mysql-test | |
parent | 85da4cfd71303d1022b334d243017fc5e8dd091b (diff) | |
download | mariadb-git-3f363c7d4d04e9fda8fdf7b0ac99c369045e687c.tar.gz |
LOCK+change+OPTIMIZE MyISAM bug
myisam/mi_delete_all.c:
reverting the wrong bugfix
mysql-test/r/delete.result:
moving the test case to where it belongs
mysql-test/t/delete.test:
moving the test case to where it belongs
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/delete.result | 13 | ||||
-rw-r--r-- | mysql-test/r/myisam.result | 8 | ||||
-rw-r--r-- | mysql-test/t/delete.test | 8 | ||||
-rw-r--r-- | mysql-test/t/myisam.test | 11 |
4 files changed, 19 insertions, 21 deletions
diff --git a/mysql-test/r/delete.result b/mysql-test/r/delete.result index 6fec36cebbe..c2230722aa6 100644 --- a/mysql-test/r/delete.result +++ b/mysql-test/r/delete.result @@ -24,16 +24,3 @@ create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a)); insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27); delete from t1 where a=27; drop table t1; -CREATE TABLE t1 (a INT); -INSERT INTO t1 VALUES (1), (2), (3); -LOCK TABLES t1 WRITE; -DELETE FROM t1; -OPTIMIZE TABLE t1; -Table Op Msg_type Msg_text -test.t1 optimize status OK -SELECT * FROM t1; -a -CHECK TABLE t1; -Table Op Msg_type Msg_text -test.t1 check status OK -drop table if exists t1; diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 8750ea94125..1d66c4cc03d 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -100,3 +100,11 @@ CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK drop table t1; +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1), (2), (3); +LOCK TABLES t1 WRITE; +INSERT INTO t1 VALUES (1), (2), (3); +OPTIMIZE TABLE t1; +Table Op Msg_type Msg_text +test.t1 optimize status OK +DROP TABLE t1; diff --git a/mysql-test/t/delete.test b/mysql-test/t/delete.test index cd56d14921e..953e22cdd55 100644 --- a/mysql-test/t/delete.test +++ b/mysql-test/t/delete.test @@ -35,11 +35,3 @@ create table t1 (a bigint not null, primary key (a,a,a,a,a,a,a,a,a,a)); insert into t1 values (2),(4),(6),(8),(10),(12),(14),(16),(18),(20),(22),(24),(26),(23),(27); delete from t1 where a=27; drop table t1; -CREATE TABLE t1 (a INT); -INSERT INTO t1 VALUES (1), (2), (3); -LOCK TABLES t1 WRITE; -DELETE FROM t1; -OPTIMIZE TABLE t1; -SELECT * FROM t1; -CHECK TABLE t1; -drop table if exists t1; diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index c607cb4d63e..dec53e92036 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -93,3 +93,14 @@ INSERT INTO t1 (post_text) VALUES ('ceci est un test'),('ceci est un test'),('ce REPAIR TABLE t1; CHECK TABLE t1; drop table t1; + +# +# Test of OPTIMIZE of locked and modified tables +# +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1), (2), (3); +LOCK TABLES t1 WRITE; +INSERT INTO t1 VALUES (1), (2), (3); +OPTIMIZE TABLE t1; +DROP TABLE t1; + |