into mashka.mysql.fi:/home/my/mysql-4.1


sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged