diff options
| author | konstantin@mysql.com <> | 2006-02-23 23:41:15 +0300 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2006-02-23 23:41:15 +0300 |
| commit | 7178f247f531ce3a3dd2faee520027ea8d2fad88 (patch) | |
| tree | be548e27a36bbf0c237fae49847f64ed795f1b3d | |
| parent | 442c2ba8af29ea77b79500fc9a7e920e2e110f13 (diff) | |
| download | mariadb-git-7178f247f531ce3a3dd2faee520027ea8d2fad88.tar.gz | |
Remove 'delayed' to make the test deterministic (already
fixed in 5.0).
A post-review fix (Bug#13134)
| -rw-r--r-- | mysql-test/r/heap.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/ps.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/heap.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/ps.test | 1 |
4 files changed, 4 insertions, 8 deletions
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result index e3b9f7db984..6bb9d0c87ee 100644 --- a/mysql-test/r/heap.result +++ b/mysql-test/r/heap.result @@ -297,11 +297,11 @@ insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 1 drop table t1; CREATE TABLE t1 (a int, key(a)) engine=heap; -insert delayed into t1 values (0); +insert into t1 values (0); delete from t1; select * from t1; a -insert delayed into t1 values (0), (1); +insert into t1 values (0), (1); select * from t1 where a = 0; a 0 diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 5404681e222..e94c2952893 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -733,9 +733,6 @@ count(*) 5 deallocate prepare stmt; drop table t1; -drop table if exists t1; -Warnings: -Note 1051 Unknown table 't1' prepare stmt from 'create table t1 (a varchar(10) character set utf8)'; execute stmt; insert into t1 (a) values (repeat('a', 20)); diff --git a/mysql-test/t/heap.test b/mysql-test/t/heap.test index a8128b79e3b..50147b4182d 100644 --- a/mysql-test/t/heap.test +++ b/mysql-test/t/heap.test @@ -238,10 +238,10 @@ drop table t1; # Bug 12796: Record doesn't show when selecting through index # CREATE TABLE t1 (a int, key(a)) engine=heap; -insert delayed into t1 values (0); +insert into t1 values (0); delete from t1; select * from t1; -insert delayed into t1 values (0), (1); +insert into t1 values (0), (1); select * from t1 where a = 0; drop table t1; diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test index b1f6be819d4..af885a5c02f 100644 --- a/mysql-test/t/ps.test +++ b/mysql-test/t/ps.test @@ -769,7 +769,6 @@ drop table t1; # recreated with PS/SP" # -drop table if exists t1; prepare stmt from 'create table t1 (a varchar(10) character set utf8)'; execute stmt; --disable_warnings |