into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint


sql/mysqld.cc:
  Auto merged