into gluh.(none):/home/gluh/mysql-4.0.bklast


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged