into  lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm


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