diff options
| author | unknown <ramil@mysql.com> | 2006-02-09 18:23:37 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2006-02-09 18:23:37 +0400 |
| commit | 550a988ac94e97c7cb1e26fb44791bdd828ec66b (patch) | |
| tree | 5b94b99cc99f8467584a5d16d2e6b5b4e449b489 | |
| parent | bd1be0279c4c14a1a4e5856f375ab70258f8c8dc (diff) | |
| parent | 1a27a433fc6e3eb50b995cd52c11edcb2364d362 (diff) | |
| download | mariadb-git-550a988ac94e97c7cb1e26fb44791bdd828ec66b.tar.gz | |
Merge mysql.com:/usr/home/ram/work/4.1.heap
into mysql.com:/usr/home/ram/work/mysql-5.0
mysql-test/t/heap.test:
Auto merged
mysql-test/r/heap.result:
merge
| -rw-r--r-- | mysql-test/r/heap.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/heap.test | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result index 3607a2e3ab5..d72f5771f15 100644 --- a/mysql-test/r/heap.result +++ b/mysql-test/r/heap.result @@ -702,11 +702,11 @@ insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' 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/t/heap.test b/mysql-test/t/heap.test index 6a8abdeea26..82294db336d 100644 --- a/mysql-test/t/heap.test +++ b/mysql-test/t/heap.test @@ -440,10 +440,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; |