bzr push into mysql-5.1 branch (mats:2720)

[Mats Kindahl]

 2720 Mats Kindahl	2008-08-27 [merge]
      Automerge
added:
  mysql-test/include/wait_for_slave_sql_error_and_skip.inc
  mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
  mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt
  mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
modified:
  mysql-test/r/multi_update.result
  sql/log_event.cc
  sql/log_event.h
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_parse.cc
  sql/sql_update.cc

=== modified file 'mysql-test/suite/binlog/r/binlog_innodb.result'
--- a/mysql-test/suite/binlog/r/binlog_innodb.result	2007-12-14 13:40:45 +0000
+++ b/mysql-test/suite/binlog/r/binlog_innodb.result	2008-08-27 14:17:55 +0000
@@ -115,14 +115,14 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
 DROP TABLE t1;
 show status like "binlog_cache_use";
 Variable_name	Value
-Binlog_cache_use	13
+Binlog_cache_use	15
 show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	0
 create table t1 (a int) engine=innodb;
 show status like "binlog_cache_use";
 Variable_name	Value
-Binlog_cache_use	14
+Binlog_cache_use	16
 show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	1
@@ -131,7 +131,7 @@ delete from t1;
 commit;
 show status like "binlog_cache_use";
 Variable_name	Value
-Binlog_cache_use	15
+Binlog_cache_use	17
 show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	1