into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/ha_heap.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged