4979 Alexander Nozdrin 2012-11-13 [merge]
Auto-merge from 5.6
added:
mysql-test/suite/rpl/t/rpl_insert_id-master.opt
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed-master.opt
4978 Marc Alff 2012-11-12 [merge]
Merge mysql-5.6 --> mysql-trunk
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).
| Thread |
|---|
| • bzr push into mysql-trunk branch (alexander.nozdrin:4978 to 4979) | Alexander Nozdrin | 14 Nov |
