into mysql.com:/home/hf/work/mysql-5.1.14573


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged