bzr push into mysql-5.5-bugteam branch (Georgi.Kodinov:3207 to 3209)

[Georgi Kodinov]

 3209 Georgi Kodinov	2010-12-17 [merge]
      merge

 3208 Georgi Kodinov	2010-12-17 [merge]
      merge

 3207 Georgi Kodinov	2010-12-17 [merge]
      merge

    added:
      mysql-test/include/io_thd_fault_injection.inc
      mysql-test/suite/innodb/r/innodb_bug56947.result
      mysql-test/suite/innodb/t/innodb_bug56947.test
      mysql-test/suite/rpl/r/rpl_binlog_errors.result
      mysql-test/suite/rpl/t/rpl_binlog_errors-master.opt
      mysql-test/suite/rpl/t/rpl_binlog_errors.test
    modified:
      mysql-test/include/restart_mysqld.inc
      mysql-test/r/join_outer_innodb.result
      mysql-test/suite/binlog/r/binlog_index.result
      mysql-test/suite/binlog/r/binlog_max_extension.result
      mysql-test/suite/binlog/t/binlog_index.test
      mysql-test/suite/binlog/t/binlog_max_extension.test
      mysql-test/t/join_outer_innodb.test
      sql/handler.cc
      sql/log.cc
      sql/log.h
      sql/mysqld.cc
      sql/rpl_injector.cc
      sql/slave.cc
      sql/slave.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_reload.cc
      sql/sql_reload.h
      sql/sql_repl.cc
      sql/sql_select.cc
=== modified file 'mysql-test/t/ctype_utf8.test'
--- a/mysql-test/t/ctype_utf8.test	2010-12-16 18:43:21 +0000
+++ b/mysql-test/t/ctype_utf8.test	2010-12-17 11:11:34 +0000
@@ -1458,6 +1458,7 @@ SELECT HEX(INSERT(_utf8 0xD18FD18E, 2, 1
 
 --echo End of 5.1 tests
 
+
 --echo Start of 5.4 tests
 
 #

=== modified file 'mysql-test/t/func_misc.test'
--- a/mysql-test/t/func_misc.test	2010-12-16 18:43:21 +0000
+++ b/mysql-test/t/func_misc.test	2010-12-17 11:11:34 +0000
@@ -536,6 +536,7 @@ SELECT 1 from t1 HAVING NAME_CONST('', a
 
 DROP TABLE t1;
 
+
 --echo #
 --echo # End of 5.5 tests
 --echo #

=== modified file 'mysql-test/t/partition_innodb.test'
--- a/mysql-test/t/partition_innodb.test	2010-12-16 18:43:21 +0000
+++ b/mysql-test/t/partition_innodb.test	2010-12-17 11:11:34 +0000
@@ -11,6 +11,7 @@ let $MYSQLD_DATADIR= `SELECT @@datadir`;
 --echo #
 --echo # Bug#56287: crash when using Partition datetime in sub in query
 --echo #
+
 CREATE TABLE t1
 (c1 bigint(20) unsigned NOT NULL AUTO_INCREMENT,
  c2 varchar(40) not null default '',
@@ -591,6 +592,7 @@ INSERT INTO t1 VALUES (1,1), (2,2);
 SELECT * FROM t1 WHERE i1 = ( SELECT i1 FROM t1 WHERE f1=0 LIMIT 1 );
 
 DROP TABLE t1;
+
 --enable_parsing
 
 --echo #

No bundle (reason: useless for push emails).