One more post-merge fix.

mysql-test/r/heap.result:
  It turns out that I didn't commit one test result (it's identical 
  to 4.1)

mysql-test/r/heap.result

@@ -709,6 +709,7 @@ a
 insert delayed into t1 values (0), (1);
 select * from t1 where a = 0;
 a
+0
 drop table t1;
 create table t1 (c char(10)) engine=memory;
 create table t2 (c varchar(10)) engine=memory;