into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570


BitKeeper/deleted/.del-binlog_innodb.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  need to record.
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
  need to record.
mysql-test/suite/rpl/r/rpl_sp.result:
  need to record.
mysql-test/suite/rpl/t/rpl_sp.test:
  manual merge.
sql/sp.cc:
  Manual merge