into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/5.1-merge


client/mysql.cc:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_class.h:
  conflicting hunk is for log.h