Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0

into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.1


BitKeeper/deleted/.del-binlog_start_comment.result:
  Auto merged
BitKeeper/deleted/.del-binlog_start_comment.test:
  Auto merged
mysql-test/extra/binlog_tests/blackhole.test:
  Manual merge
mysql-test/r/case.result:
  Manual merge
mysql-test/r/mysqlbinlog2.result:
  Manual merge
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  Manual merge
mysql-test/t/case.test:
  Manual merge

mysql-test/extra/binlog_tests/blackhole.test

@@ -126,6 +126,7 @@ select * from t2;
 select * from t3;
 
 let $VERSION=`select version()`;
+--replace_regex /file_id=[0-9]+/file_id=#/
 source include/show_binlog_events.inc;
 drop table t1,t2,t3;