From: Bjorn Munch Date: January 4 2012 3:54pm Subject: bzr push into mysql-5.5-mtr branch (bjorn.munch:3274 to 3275) List-Archive: http://lists.mysql.com/commits/142288 Message-Id: <201201041554.q04FsRMr023627@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3275 Bjorn Munch 2012-01-04 Followup after 13055685: Use new syntax to mask different error output in affected tests modified: mysql-test/include/show_slave_status.inc mysql-test/include/wait_for_slave_io_error.inc mysql-test/suite/rpl/r/rpl_log_pos.result mysql-test/suite/rpl/r/rpl_manual_change_index_file.result mysql-test/suite/rpl/r/rpl_packet.result 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 3274 Bjorn Munch 2012-01-03 [merge] merge 5.5 => 5.5-mtr added: mysql-test/include/relocate_binlogs.inc mysql-test/suite/innodb/r/innodb_bug12661768.result mysql-test/suite/innodb/r/innodb_bug60229.result mysql-test/suite/innodb/r/innodb_cmp_drop_table.result mysql-test/suite/innodb/r/innodb_misc1.result mysql-test/suite/innodb/r/innodb_replace.result mysql-test/suite/innodb/t/innodb_bug12661768.test mysql-test/suite/innodb/t/innodb_bug60229-master.opt mysql-test/suite/innodb/t/innodb_bug60229.test mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt mysql-test/suite/innodb/t/innodb_cmp_drop_table.test mysql-test/suite/innodb/t/innodb_misc1-master.opt mysql-test/suite/innodb/t/innodb_misc1.test mysql-test/suite/innodb/t/innodb_replace.test mysql-test/suite/rpl/r/rpl_binlog_index.result mysql-test/suite/rpl/r/rpl_connection.result mysql-test/suite/rpl/r/rpl_row_find_row_debug.result mysql-test/suite/rpl/t/rpl_binlog_index.test mysql-test/suite/rpl/t/rpl_connection.test mysql-test/suite/rpl/t/rpl_row_find_row_debug.test mysql-test/suite/sys_vars/r/metadata_locks_cache_size_basic.result mysql-test/suite/sys_vars/t/metadata_locks_cache_size_basic-master.opt mysql-test/suite/sys_vars/t/metadata_locks_cache_size_basic.test sql/signal_handler.cc modified: VERSION client/mysql_plugin.c client/mysql_upgrade.c client/mysqldump.c cmake/install_macros.cmake cmd-line-utils/libedit/histedit.h cmd-line-utils/libedit/np/unvis.c cmd-line-utils/libedit/np/vis.c cmd-line-utils/libedit/read.c include/my_stacktrace.h libmysql/CMakeLists.txt libmysqld/CMakeLists.txt mysql-test/collections/default.experimental mysql-test/include/begin_include_file.inc mysql-test/mysql-test-run.pl mysql-test/r/alter_table-big.result mysql-test/r/create-big.result mysql-test/r/func_if.result mysql-test/r/func_str.result mysql-test/r/gis.result mysql-test/r/group_min_max_innodb.result mysql-test/r/init_connect.result mysql-test/r/mysql_upgrade.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/mysqldump.result mysql-test/r/partition_innodb_plugin.result mysql-test/r/query_cache.result mysql-test/r/select.result mysql-test/r/sp.result mysql-test/r/type_newdecimal.result mysql-test/r/view_grant.result mysql-test/suite/federated/federated.test mysql-test/suite/federated/federated_plugin.test mysql-test/suite/innodb/r/innodb-lock.result mysql-test/suite/innodb/r/innodb.result mysql-test/suite/innodb/r/innodb_bug54044.result mysql-test/suite/innodb/t/innodb-lock.test mysql-test/suite/innodb/t/innodb.test mysql-test/suite/innodb/t/innodb_bug54044.test mysql-test/suite/innodb/t/innodb_corrupt_bit.test mysql-test/suite/parts/r/partition_debug_innodb.result mysql-test/suite/parts/t/partition_debug_innodb.test mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/t/rpl_empty_master_host.test mysql-test/suite/rpl/t/rpl_known_bugs_detection.test mysql-test/suite/rpl/t/rpl_server_id_ignore.test mysql-test/suite/sys_vars/inc/query_cache_size_basic.inc mysql-test/suite/sys_vars/r/query_cache_size_basic_32.result mysql-test/suite/sys_vars/r/query_cache_size_basic_64.result mysql-test/suite/sys_vars/t/disabled.def mysql-test/t/alter_table-big.test mysql-test/t/create-big.test mysql-test/t/disabled.def mysql-test/t/func_if.test mysql-test/t/func_str.test mysql-test/t/gis.test mysql-test/t/group_min_max_innodb.test mysql-test/t/init_connect.test mysql-test/t/mysql_upgrade.test mysql-test/t/mysqldump.test mysql-test/t/partition_innodb_plugin.test mysql-test/t/query_cache.test mysql-test/t/select.test mysql-test/t/sp.test mysql-test/t/type_newdecimal.test mysql-test/t/view_grant.test mysys/stacktrace.c scripts/mysqld_safe.sh sql/CMakeLists.txt sql/field.cc sql/field.h sql/field_conv.cc sql/ha_partition.cc sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.cc sql/item_cmpfunc.h sql/item_func.cc sql/item_strfunc.cc sql/log.cc sql/log.h sql/log_event.cc sql/log_event.h sql/mdl.cc sql/mdl.h sql/my_decimal.h sql/mysqld.cc sql/mysqld.h sql/nt_servc.cc sql/nt_servc.h sql/opt_range.cc sql/rpl_rli.cc sql/rpl_rli.h sql/set_var.h sql/share/errmsg-utf8.txt sql/slave.cc sql/sp_head.cc sql/sql_acl.cc sql/sql_cache.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_parse.cc sql/sql_plist.h sql/sql_plugin.cc sql/sql_reload.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_table.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/sys_vars.h storage/archive/ha_archive.cc storage/federated/ha_federated.cc storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0pcur.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0lru.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/fil/fil0fil.c storage/innobase/fsp/fsp0fsp.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/handler/handler0alter.cc storage/innobase/include/btr0cur.h storage/innobase/include/btr0pcur.h storage/innobase/include/buf0buf.h storage/innobase/include/buf0buf.ic storage/innobase/include/buf0types.h storage/innobase/include/data0data.h storage/innobase/include/data0data.ic storage/innobase/include/fil0fil.h storage/innobase/include/fsp0fsp.h storage/innobase/include/fsp0fsp.ic storage/innobase/include/mem0mem.ic storage/innobase/include/page0page.h storage/innobase/include/row0mysql.h storage/innobase/include/row0sel.h storage/innobase/include/univ.i storage/innobase/include/ut0mem.h storage/innobase/include/ut0rnd.ic storage/innobase/mem/mem0pool.c storage/innobase/os/os0proc.c storage/innobase/page/page0page.c storage/innobase/pars/pars0pars.c storage/innobase/row/row0ins.c storage/innobase/row/row0mysql.c storage/innobase/row/row0sel.c storage/innobase/srv/srv0start.c storage/innobase/ut/ut0mem.c storage/myisam/mi_close.c storage/myisam/mi_packrec.c strings/decimal.c tests/mysql_client_test.c === modified file 'mysql-test/include/show_slave_status.inc' --- a/mysql-test/include/show_slave_status.inc 2010-12-20 14:15:01 +0000 +++ b/mysql-test/include/show_slave_status.inc 2012-01-04 15:16:17 +0000 @@ -55,6 +55,11 @@ # comma-separated list. Example: # # --let $status_items= Master_Log_File, Relay_Master_Log_File +# +# $slave_io_error_replace +# If set, one or more regex patterns for replacing variable +# text in the error message. Syntax as --replace-regex +# --let $_show_slave_status_items=$status_items @@ -70,6 +75,7 @@ while ($_show_slave_status_items) --let $_show_slave_status_items= `SELECT LTRIM(SUBSTRING('$_show_slave_status_items', LENGTH('$_show_slave_status_name') + 2))` --let $_show_slave_status_value= query_get_value(SHOW SLAVE STATUS, $_show_slave_status_name, 1) + --replace_regex $slave_io_error_replace --let $_show_slave_status_value= `SELECT REPLACE("$_show_slave_status_value", '$MYSQL_TEST_DIR', 'MYSQL_TEST_DIR')` --echo $_show_slave_status_name = '$_show_slave_status_value' } === modified file 'mysql-test/include/wait_for_slave_io_error.inc' --- a/mysql-test/include/wait_for_slave_io_error.inc 2010-12-19 17:15:12 +0000 +++ b/mysql-test/include/wait_for_slave_io_error.inc 2012-01-04 15:16:17 +0000 @@ -33,6 +33,10 @@ # (e.g., temporary connection error) and does not cause the slave # IO thread to stop. # +# $slave_io_error_replace +# If set, one or more regex patterns for replacing variable +# text in the error message. Syntax as --replace-regex +# # $slave_timeout # See include/wait_for_slave_param.inc # === modified file 'mysql-test/suite/rpl/r/rpl_log_pos.result' --- a/mysql-test/suite/rpl/r/rpl_log_pos.result 2011-10-28 21:07:16 +0000 +++ b/mysql-test/suite/rpl/r/rpl_log_pos.result 2012-01-04 15:16:17 +0000 @@ -9,6 +9,7 @@ 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 XXX, the last byte read was read from 'master-bin.000001' at XXX.'' 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-28 21:07:16 +0000 +++ b/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result 2012-01-04 15:16:17 +0000 @@ -5,6 +5,7 @@ CREATE TABLE t1(c1 INT); FLUSH LOGS; call mtr.add_suppression('Got fatal error 1236 from master when reading data from binary log: .*could not find next log'); 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 find next log; the last event was read from 'master-bin.000002' at XXX, the last byte read was read from 'master-bin.000002' at XXX.'' CREATE TABLE t2(c1 INT); FLUSH LOGS; CREATE TABLE t3(c1 INT); === modified file 'mysql-test/suite/rpl/r/rpl_packet.result' --- a/mysql-test/suite/rpl/r/rpl_packet.result 2011-10-28 21:07:16 +0000 +++ b/mysql-test/suite/rpl/r/rpl_packet.result 2012-01-04 15:16:17 +0000 @@ -37,6 +37,7 @@ DROP TABLE t1; CREATE TABLE t1 (f1 int PRIMARY KEY, f2 LONGTEXT, f3 LONGTEXT) ENGINE=MyISAM; INSERT INTO t1(f1, f2, f3) VALUES(1, REPEAT('a', @@global.max_allowed_packet), REPEAT('b', @@global.max_allowed_packet)); 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 XXX, the last byte read was read from 'master-bin.000001' at XXX.'' STOP SLAVE; RESET SLAVE; RESET MASTER; === modified file 'mysql-test/suite/rpl/t/rpl_log_pos.test' --- a/mysql-test/suite/rpl/t/rpl_log_pos.test 2011-10-28 21:07:16 +0000 +++ b/mysql-test/suite/rpl/t/rpl_log_pos.test 2012-01-04 15:16:17 +0000 @@ -22,12 +22,9 @@ let $status_items= Read_Master_Log_Pos; source include/show_slave_status.inc; start slave; 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; +--let $show_slave_io_error= 1 +# Mask line numbers, and whether master-bin is preceded by "./" or "." +--let $slave_io_error_replace= / at [0-9]*/ at XXX/ /\.\/*master-bin/master-bin/ 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-28 21:07:16 +0000 +++ b/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test 2012-01-04 15:16:17 +0000 @@ -60,12 +60,9 @@ 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 +--let $show_slave_io_error= 1 +# Mask line numbers, and whether master-bin is preceded by "./" or "." +--let $slave_io_error_replace= / at [0-9]*/ at XXX/ /\.\/*master-bin/master-bin/ --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-28 21:07:16 +0000 +++ b/mysql-test/suite/rpl/t/rpl_packet.test 2012-01-04 15:16:17 +0000 @@ -125,12 +125,9 @@ 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 + +# Mask line numbers, and whether master-bin is preceded by "./" or "." +--let $slave_io_error_replace= / at [0-9]*/ at XXX/ /\.\/*master-bin/master-bin/ --source include/wait_for_slave_io_error.inc # Remove the bad binlog and clear error status on slave. No bundle (reason: useless for push emails).