into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl-a


sql/slave.cc:
  Auto merged