Commit 550a988a authored by unknown's avatar unknown
Browse files

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
parents bd1be027 1a27a433

mysql-test/r/heap.result

+2 −2
Original line number Diff line number Diff line
@@ -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

mysql-test/t/heap.test

+2 −2
Original line number Diff line number Diff line
@@ -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;