into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint


sql/mysqld.cc:
  Auto merged