into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1


mysql-test/r/heap.result:
  Auto merged
storage/heap/hp_create.c:
  Auto merged