Commit ebe937cc authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/r/heap_btree.result:
  Auto merged
parents 4a974740 b6d3f563

mysql-test/r/heap_btree.result

+1 −0
Original line number Diff line number Diff line
@@ -294,3 +294,4 @@ DROP TABLE t1; 
CREATE TABLE t1 (a INT, UNIQUE USING BTREE(a)) ENGINE=MEMORY;

INSERT INTO t1 VALUES(NULL),(NULL);

DROP TABLE t1;

End of 5.0 tests