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


sql/sql_table.cc:
  Auto merged