into mysql.com:/d2/hf/common/my51-common libmysqld/lib_sql.cc: Auto merged sql/item_func.cc: Auto merged