into  zim.(none):/home/brian/mysql/merge-5.1


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged