into mysql.com:/home/gluh/MySQL/Merge/5.1 sql/item.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged