bzr push into mysql-5.6 branch (alexander.nozdrin:4583 to 4584) Bug#14823837

[Alexander Nozdrin]

 4584 Alexander Nozdrin	2012-11-13
      Bug#14823837: RPL TEST RPL_SWITCH_STM_ROW_MIXED AND RPL_INSERT_ID FAIL
      WITH STACK OVERRUN.
      
      Test issue. Adding .opt files with {?PB_HOST_SPECIFIC_MYSQLD_ARGS} variable
      to pass host-specific arguments to the test (in particular, pass increased
      thread-stack-memory for the server running on SPARC64).

    added:
      mysql-test/suite/rpl/t/rpl_insert_id-master.opt
      mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed-master.opt
 4583 Marc Alff	2012-11-12
      Bug#14741537 - MYSQL 5.6, GTID AND PERFORMANCE_SCHEMA
      
      Implementing additional review comments:
      - changed the wording for ER_BINLOG_STMT_MODE_AND_NO_REPL_TABLES
      - relaxed an error to a warning, when non replicated tables are only read,
      not written to.

    modified:
      mysql-test/suite/perfschema/include/binlog_edge_common.inc
      mysql-test/suite/perfschema/r/binlog_edge_mix.result
      mysql-test/suite/perfschema/r/binlog_edge_row.result
      mysql-test/suite/perfschema/r/binlog_edge_stmt.result
      sql/binlog.cc
      sql/share/errmsg-utf8.txt
=== added file 'mysql-test/suite/rpl/t/rpl_insert_id-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_insert_id-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_insert_id-master.opt	2012-11-13 08:00:52 +0000
@@ -0,0 +1 @@
+${?PB_HOST_SPECIFIC_MYSQLD_ARGS}

=== added file 'mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed-master.opt'
--- a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed-master.opt	2012-11-13 08:00:52 +0000
@@ -0,0 +1 @@
+${?PB_HOST_SPECIFIC_MYSQLD_ARGS}

No bundle (reason: useless for push emails).