into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


sql/sql_table.cc:
  Auto merged