3536 Andrei Elkin 2011-10-29 [merge]
merge from 5.5 to trunk.
modified:
mysql-test/suite/rpl/r/rpl_checksum.result
mysql-test/suite/rpl/r/rpl_log_pos.result
mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
mysql-test/suite/rpl/t/rpl_checksum.test
mysql-test/suite/rpl/t/rpl_log_pos.test
mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/rpl/t/rpl_row_event_max_size.test
3535 Andrei Elkin 2011-10-28 [merge]
merge from trunk to local tree.
removed:
storage/perfschema/table_file_summary.cc
storage/perfschema/table_file_summary.h
added:
storage/perfschema/table_file_summary_by_event_name.cc
storage/perfschema/table_file_summary_by_event_name.h
storage/perfschema/table_file_summary_by_instance.cc
storage/perfschema/table_file_summary_by_instance.h
modified:
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/suite/opt_trace/r/range_no_prot.result
mysql-test/suite/opt_trace/r/range_ps_prot.result
mysql-test/suite/perfschema/r/pfs_upgrade.result
mysql-test/suite/perfschema/r/relaylog.result
mysql-test/suite/perfschema/r/schema.result
mysql-test/suite/perfschema/r/start_server_nothing.result
mysql-test/suite/perfschema/r/table_schema.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result*
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
scripts/mysql_system_tables.sql
sql/sql_const.h
sql/sql_select.cc
sql/sys_vars.cc
storage/innobase/fil/fil0fil.c
storage/innobase/fsp/fsp0fsp.c
storage/innobase/include/buf0buf.h
storage/innobase/include/fil0fil.h
storage/innobase/include/fsp0fsp.h
storage/innobase/include/sync0rw.ic
storage/innobase/lock/lock0lock.c
storage/innobase/row/row0umod.c
storage/innobase/srv/srv0start.c
storage/perfschema/CMakeLists.txt
storage/perfschema/pfs.cc
storage/perfschema/pfs_engine_table.cc
storage/perfschema/pfs_instr.cc
storage/perfschema/pfs_instr.h
storage/perfschema/pfs_stat.h
storage/perfschema/pfs_visitor.cc
storage/perfschema/pfs_visitor.h
storage/perfschema/table_helper.h
storage/perfschema/table_socket_summary_by_instance.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_checksum.result'
--- a/mysql-test/suite/rpl/r/rpl_checksum.result 2011-10-27 19:28:15 +0000
+++ b/mysql-test/suite/rpl/r/rpl_checksum.result 2011-10-28 21:22:19 +0000
@@ -64,7 +64,6 @@ insert into t1 values (1) /* will not be
set @@global.debug='d,simulate_slave_unaware_checksum';
start slave;
include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Slave can not handle replication events with the checksum that master is configured to log; the last event was read from './master-bin.000010' at 114, the last byte read was read from './master-bin.000010' at 114.''
select count(*) as zero from t1;
zero
0
=== modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result'
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result 2011-10-27 19:28:15 +0000
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result 2011-10-28 21:22:19 +0000
@@ -9,7 +9,6 @@ change master to master_log_pos=MASTER_L
Read_Master_Log_Pos = '75'
start slave;
include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'log event entry exceeded max_allowed_packet; Increase max_allowed_packet on master; the last event was read from './master-bin.000001' at 75, the last byte read was read from './master-bin.000001' at 94.''
include/stop_slave_sql.inc
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
=== modified file 'mysql-test/suite/rpl/r/rpl_manual_change_index_file.result'
--- a/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result 2011-10-27 19:28:15 +0000
+++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result 2011-10-28 21:22:19 +0000
@@ -44,7 +44,6 @@ START SLAVE IO_THREAD;
# Instead of EE_FILENOTFOUND, ER_MASTER_FATAL_ERROR_READING_BINLOG
# and the specific information are sent to slave.
include/wait_for_slave_io_error.inc [errno=1236]
-Last_IO_Error = 'Got fatal error 1236 from master when reading data from binary log: 'Could not open log file''
[ on master ]
# Restore master-bin.000001 file
[ on slave ]
=== modified file 'mysql-test/suite/rpl/t/rpl_checksum.test'
--- a/mysql-test/suite/rpl/t/rpl_checksum.test 2011-05-17 22:52:04 +0000
+++ b/mysql-test/suite/rpl/t/rpl_checksum.test 2011-10-28 21:22:19 +0000
@@ -102,7 +102,12 @@ connection slave;
set @@global.debug='d,simulate_slave_unaware_checksum';
start slave;
let $slave_io_errno= 1236; # ER_MASTER_FATAL_ERROR_READING_BINLOG
---let $show_slave_io_error= 1
+#
+# Win and Unix path is printed differently: BUG#13055685. So
+# show_slave_io_error is made 0 until the bug fixes provide necessary
+# facilities
+#
+--let $show_slave_io_error= 0
source include/wait_for_slave_io_error.inc;
select count(*) as zero from t1;
=== modified file 'mysql-test/suite/rpl/t/rpl_log_pos.test'
--- a/mysql-test/suite/rpl/t/rpl_log_pos.test 2010-12-19 17:22:30 +0000
+++ b/mysql-test/suite/rpl/t/rpl_log_pos.test 2011-10-28 21:22:19 +0000
@@ -22,7 +22,12 @@ let $status_items= Read_Master_Log_Pos;
source include/show_slave_status.inc;
start slave;
let $slave_io_errno= 1236;
-let $show_slave_io_error= 1;
+#
+# Win and Unix path is printed differently: BUG#13055685. So
+# show_slave_io_error is made 0 until the bug fixes provide necessary
+# facilities
+#
+let $show_slave_io_error= 0;
source include/wait_for_slave_io_error.inc;
source include/stop_slave_sql.inc;
=== modified file 'mysql-test/suite/rpl/t/rpl_manual_change_index_file.test'
--- a/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test 2011-10-03 11:49:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test 2011-10-28 21:22:19 +0000
@@ -61,6 +61,11 @@ call mtr.add_suppression('Got fatal erro
connection slave;
# 1236 = ER_MASTER_FATAL_ERROR_READING_BINLOG
--let $slave_io_errno= 1236
+#
+# Win and Unix path is printed differently: BUG#13055685. So
+# show_slave_io_error is made 0 until the bug fixes provide necessary
+# facilities
+#
--let $show_slave_io_error= 0
--source include/wait_for_slave_io_error.inc
@@ -142,7 +147,12 @@ START SLAVE IO_THREAD;
--echo # Instead of EE_FILENOTFOUND, ER_MASTER_FATAL_ERROR_READING_BINLOG
--echo # and the specific information are sent to slave.
let $slave_io_errno= 1236;
-let $show_slave_io_error= 1;
+#
+# Win and Unix path is printed differently: BUG#13055685. So
+# show_slave_io_error is made 0 until the bug fixes provide necessary
+# facilities
+#
+let $show_slave_io_error= 0;
source include/wait_for_slave_io_error.inc;
connection master;
=== modified file 'mysql-test/suite/rpl/t/rpl_packet.test'
--- a/mysql-test/suite/rpl/t/rpl_packet.test 2011-10-03 11:49:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_packet.test 2011-10-28 21:22:19 +0000
@@ -144,6 +144,11 @@ connection slave;
# The slave I/O thread must stop after receiving
# 1236=ER_MASTER_FATAL_ERROR_READING_BINLOG error message from master.
--let $slave_io_errno= 1236
+#
+# Win and Unix path is printed differently: BUG#13055685. So
+# show_slave_io_error is made 0 until the bug fixes provide necessary
+# facilities
+#
--let $show_slave_io_error= 0
--source include/wait_for_slave_io_error.inc
=== modified file 'mysql-test/suite/rpl/t/rpl_row_event_max_size.test'
--- a/mysql-test/suite/rpl/t/rpl_row_event_max_size.test 2011-10-03 11:49:38 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_event_max_size.test 2011-10-28 21:22:19 +0000
@@ -73,6 +73,11 @@ call mtr.add_suppression("The slave coor
# Show slave last IO errno
drop table t1;
let $slave_io_errno= 1236;
+#
+# Win and Unix path is printed differently: BUG#13055685. So
+# show_slave_io_error is made 0 until the bug fixes provide necessary
+# facilities
+#
let $show_slave_io_error= 0;
source include/wait_for_slave_io_error.inc;
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk branch (andrei.elkin:3535 to 3536) | Andrei Elkin | 1 Nov |
