into bodhi.(none):/opt/local/work/mysql-5.0-runtime sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged
