into  magare.gmz:/home/kgeorge/mysql/work/B30604-5.1-opt


BitKeeper/deleted/.del-binlog_innodb.result:
  Auto merged
BitKeeper/deleted/.del-binlog_innodb.test:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
  merged bug 30604 to 5.1-opt
sql/sp.cc:
  merged bug 30604 to 5.1-opt