bk commit into 5.0 tree (ramil:1.2047)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2047 06/02/09 18:23:37 ramil@stripped +2 -0
  Merge mysql.com:/usr/home/ram/work/4.1.heap
  into  mysql.com:/usr/home/ram/work/mysql-5.0

  mysql-test/r/heap.result
    1.46 06/02/09 18:23:32 ramil@stripped +2 -4
    merge

  mysql-test/t/heap.test
    1.32 06/02/09 18:20:39 ramil@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-5.0/RESYNC

--- 1.45/mysql-test/r/heap.result	2006-02-03 03:00:50 +04:00
+++ 1.46/mysql-test/r/heap.result	2006-02-09 18:23:32 +04:00
@@ -702,11 +702,11 @@ insert into t1 values ("abcdefghijklmnop
 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

--- 1.31/mysql-test/t/heap.test	2006-02-02 18:25:22 +04:00
+++ 1.32/mysql-test/t/heap.test	2006-02-09 18:20:39 +04:00
@@ -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;