mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
6e69536956
Problem 1: tests often fail in pushbuild with a timeout when waiting for the slave to start/stop/receive error. Fix 1: Updated the wait_for_slave_* macros in the following way: - The timeout is increased by a factor ten - Refactored the macros so that wait_for_slave_param does the work for the other macros. Problem 2: Tests are often incorrectly written, lacking a source include/wait_for_slave_to_[start|stop].inc. Fix 2: Improved the chance to get it right by adding include/start_slave.inc and include/stop_slave.inc, and updated tests to use these. Problem 3: The the built-in test language command wait_for_slave_to_stop is a misnomer (does not wait for the slave io thread) and does not give as much debug info in case of failure as the otherwise equivalent macro source include/wait_for_slave_sql_to_stop.inc Fix 3: Replaced all calls to the built-in command by a call to the macro. Problem 4: Some, but not all, of the wait_for_slave_* macros had an implicit connection slave. This made some tests confusing to read, and made it more difficult to use the macro in circular replication scenarios, where the connection named master needs to wait. Fix 4: Removed the implicit connection slave from all wait_for_slave_* macros, and updated tests to use an explicit connection slave where necessary. Problem 5: The macros wait_slave_status.inc and wait_show_pattern.inc were unused. Moreover, using them is difficult and error-prone. Fix 5: remove these macros. Problem 6: log_bin_trust_function_creators_basic failed when running tests because it assumed @@global.log_bin_trust_function_creators=1, and some tests modified this variable without resetting it to its original value. Fix 6: All tests that use this variable have been updated so that they reset the value at end of test. mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test: Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test: Replaced wait_for_slave_to_stop by include/wait_for_slave_sql_to_stop.inc Added connection slave since includ/wait_for_slave_sql_to_stop.inc does not do that anymore. mysql-test/extra/rpl_tests/rpl_log.test: Replaced start slave+wait_slave_status by start_slave.inc mysql-test/include/reset_master_and_slave.inc: replaced start/stop slave by start_slave.inc/stop_slave.inc mysql-test/include/sync_slave_io_with_master.inc: Improved comments and error message. mysql-test/include/wait_for_slave_io_to_stop.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_for_slave_param.inc: - Improved usage instructions - Added more debug info in case of timeout - Added parameters $slave_param_comparison, $slave_timeout, $slave_keep_connection, $slave_error_message mysql-test/include/wait_for_slave_sql_error.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_for_slave_sql_to_start.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_for_slave_sql_to_stop.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_for_slave_to_start.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_for_slave_to_stop.inc: Refactored to use wait_for_slave_param.inc. Removed connection slave. mysql-test/include/wait_show_pattern.inc: Removed unused (and error-prone) file mysql-test/include/wait_slave_status.inc: Removed unused (and error-prone) file mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test: Renamed $keep_connection to $slave_keep_connection. mysql-test/suite/rpl/t/rpl_bug26395.test: Replace stop slave by stop_slave.inc mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test: Replace start/stop slave by start_slave.inc/stop_slave.inc. Replace wait_for_slave_param by wait_for_slave_sql_to_stop.inc. mysql-test/suite/rpl/t/rpl_dual_pos_advance.test: Renamed $keep_connection to $slave_keep_connection. mysql-test/suite/rpl/t/rpl_flushlog_loop.test: Replace wait_slave_status by start_slave.inc mysql-test/suite/rpl/t/rpl_idempotency.test: Added connection slave since wait_for_slave_sql_to_stop.inc does not do that any more. mysql-test/suite/rpl/t/rpl_incident.test: Replaced wait_for_slave_to_stop by wait_for_slave_sql_to_stop.inc mysql-test/suite/rpl/t/rpl_init_slave.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. Replaced save_master_pos;connection slave;sync_with_master by sync_slave_with_master. mysql-test/suite/rpl/t/rpl_log_pos.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. Replaced wait_for_slave_param by other wait_for_slave_* macros. mysql-test/suite/rpl/t/rpl_packet.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_row_until.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. Replaced save_master_pos;connection slave;sync_with_master by sync_slave_with_master. mysql-test/suite/rpl/t/rpl_server_id1.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_slave_grp_exec.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_slave_skip.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_slave_status.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/suite/rpl/t/rpl_sp.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/suite/rpl/t/rpl_sp_effects.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/suite/rpl/t/rpl_stm_until.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. Replaced save_master_pos;connection slave;sync_with_master by sync_slave_with_master. mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test: Replaced start slave by start_slave.inc. Added explicit connection slave since wait_for_slave_sql_to_stop.inc does not do that anymore. mysql-test/t/disabled.def: Disabled failing test. mysql-test/t/func_time.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/grant.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/grant2.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/innodb_notembedded.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/log_bin_trust_function_creators_func.test: Restore @@global.log_bin_trust_function_creators at end of test. Clean up at end of test by dropping the created user. mysql-test/t/query_cache.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/query_cache_notembedded.test: Restore @@global.log_bin_trust_function_creators at end of test. mysql-test/t/rpl_init_slave_func.test: Replaced start/stop slave by start_slave.inc/stop_slave.inc. mysql-test/t/timezone2.test: Restore @@global.log_bin_trust_function_creators at end of test. |
||
|---|---|---|
| .. | ||
| rpl000001.a.result | ||
| rpl000001.b.result | ||
| rpl000010.result | ||
| rpl000011.result | ||
| rpl000013.result | ||
| rpl000017.result | ||
| rpl_000015.result | ||
| rpl_alter.result | ||
| rpl_alter_db.result | ||
| rpl_auto_increment.result | ||
| rpl_auto_increment_11932.result | ||
| rpl_binlog_grant.result | ||
| rpl_bit.result | ||
| rpl_bit_npk.result | ||
| rpl_bug26395.result | ||
| rpl_bug31076.result | ||
| rpl_bug33931.result | ||
| rpl_change_master.result | ||
| rpl_charset.result | ||
| rpl_charset_sjis.result | ||
| rpl_circular_for_4_hosts.result | ||
| rpl_colSize.result | ||
| rpl_commit_after_flush.result | ||
| rpl_create_database.result | ||
| rpl_critical_errors.result | ||
| rpl_critical_errors.result.txt | ||
| rpl_ddl.result | ||
| rpl_deadlock_innodb.result | ||
| rpl_delete_no_where.result | ||
| rpl_do_grant.result | ||
| rpl_drop.result | ||
| rpl_drop_db.result | ||
| rpl_drop_temp.result | ||
| rpl_drop_view.result | ||
| rpl_dual_pos_advance.result | ||
| rpl_EE_err.result | ||
| rpl_empty_master_crash.result | ||
| rpl_err_ignoredtable.result | ||
| rpl_events.result | ||
| rpl_extraCol_innodb.result | ||
| rpl_extraCol_myisam.result | ||
| rpl_extraColmaster_innodb.result | ||
| rpl_extraColmaster_myisam.result | ||
| rpl_failed_optimize.result | ||
| rpl_flushlog_loop.result | ||
| rpl_foreign_key_innodb.result | ||
| rpl_found_rows.result | ||
| rpl_free_items.result | ||
| rpl_get_lock.result | ||
| rpl_grant.result | ||
| rpl_idempotency.result | ||
| rpl_ignore_grant.result | ||
| rpl_ignore_revoke.result | ||
| rpl_ignore_table.result | ||
| rpl_ignore_table_update.result | ||
| rpl_incident.result | ||
| rpl_init_slave.result | ||
| rpl_innodb.result | ||
| rpl_innodb_bug28430.result | ||
| rpl_innodb_bug30888.result | ||
| rpl_innodb_mixed_ddl.result | ||
| rpl_innodb_mixed_dml.result | ||
| rpl_insert.result | ||
| rpl_insert_id.result | ||
| rpl_insert_id_pk.result | ||
| rpl_insert_ignore.result | ||
| rpl_insert_select.result | ||
| rpl_invoked_features.result | ||
| rpl_known_bugs_detection.result | ||
| rpl_LD_INFILE.result | ||
| rpl_load_from_master.result | ||
| rpl_load_table_from_master.result | ||
| rpl_loaddata.result | ||
| rpl_loaddata_charset.result | ||
| rpl_loaddata_fatal.result | ||
| rpl_loaddata_m.result | ||
| rpl_loaddata_map.result | ||
| rpl_loaddata_s.result | ||
| rpl_loaddata_simple.result | ||
| rpl_loaddatalocal.result | ||
| rpl_loadfile.result | ||
| rpl_locale.result | ||
| rpl_log_pos.result | ||
| rpl_many_optimize.result | ||
| rpl_master_pos_wait.result | ||
| rpl_misc_functions.result | ||
| rpl_mixed_ddl_dml.result | ||
| rpl_multi_delete.result | ||
| rpl_multi_delete2.result | ||
| rpl_multi_engine.result | ||
| rpl_multi_update.result | ||
| rpl_multi_update2.result | ||
| rpl_multi_update3.result | ||
| rpl_multi_update4.result | ||
| rpl_optimize.result | ||
| rpl_packet.result | ||
| rpl_ps.result | ||
| rpl_rbr_to_sbr.result | ||
| rpl_read_only.result | ||
| rpl_redirect.result | ||
| rpl_relay_space_innodb.result | ||
| rpl_relay_space_myisam.result | ||
| rpl_relayrotate.result | ||
| rpl_relayspace.result | ||
| rpl_replicate_do.result | ||
| rpl_replicate_ignore_db.result | ||
| rpl_report.result | ||
| rpl_rewrt_db.result | ||
| rpl_rotate_logs.result | ||
| rpl_row_001.result | ||
| rpl_row_4_bytes.result | ||
| rpl_row_basic_2myisam.result | ||
| rpl_row_basic_3innodb.result | ||
| rpl_row_basic_8partition.result | ||
| rpl_row_basic_11bugs-master.opt | ||
| rpl_row_basic_11bugs-slave.opt | ||
| rpl_row_basic_11bugs.result | ||
| rpl_row_blob_innodb.result | ||
| rpl_row_blob_myisam.result | ||
| rpl_row_colSize.result | ||
| rpl_row_create_table.result | ||
| rpl_row_delayed_ins.result | ||
| rpl_row_drop.result | ||
| rpl_row_err_ignoredtable.result | ||
| rpl_row_flsh_tbls.result | ||
| rpl_row_func001.result | ||
| rpl_row_func002.result | ||
| rpl_row_func003.result | ||
| rpl_row_inexist_tbl.result | ||
| rpl_row_insert_delayed.result | ||
| rpl_row_loaddata_m.result | ||
| rpl_row_log.result | ||
| rpl_row_log_innodb.result | ||
| rpl_row_max_relay_size.result | ||
| rpl_row_multi_query.result | ||
| rpl_row_mysqlbinlog.result | ||
| rpl_row_mystery22.result | ||
| rpl_row_NOW.result | ||
| rpl_row_reset_slave.result | ||
| rpl_row_sp001.result | ||
| rpl_row_sp002_innodb.result | ||
| rpl_row_sp003.result | ||
| rpl_row_sp005.result | ||
| rpl_row_sp006_InnoDB.result | ||
| rpl_row_sp007_innodb.result | ||
| rpl_row_sp008.result | ||
| rpl_row_sp009.result | ||
| rpl_row_sp010.result | ||
| rpl_row_sp011.result | ||
| rpl_row_sp012.result | ||
| rpl_row_stop_middle.result | ||
| rpl_row_stop_middle_update.result | ||
| rpl_row_tabledefs_2myisam.result | ||
| rpl_row_tabledefs_3innodb.result | ||
| rpl_row_tabledefs_7ndb.result | ||
| rpl_row_trig001.result | ||
| rpl_row_trig002.result | ||
| rpl_row_trig003.result | ||
| rpl_row_trig004.result | ||
| rpl_row_unsafe_funcs.result | ||
| rpl_row_until.result | ||
| rpl_row_USER.result | ||
| rpl_row_UUID.result | ||
| rpl_row_view01.result | ||
| rpl_server_id.result | ||
| rpl_server_id1.result | ||
| rpl_server_id2.result | ||
| rpl_session_var.result | ||
| rpl_set_charset.result | ||
| rpl_sf.result | ||
| rpl_skip_error.result | ||
| rpl_slave_grp_exec.result | ||
| rpl_slave_skip.result | ||
| rpl_slave_status.result | ||
| rpl_sp.result | ||
| rpl_sp004.result | ||
| rpl_sp_effects.result | ||
| rpl_sporadic_master.result | ||
| rpl_ssl.result | ||
| rpl_ssl1.result | ||
| rpl_start_stop_slave.result | ||
| rpl_stm_000001.result | ||
| rpl_stm_auto_increment_bug33029.result | ||
| rpl_stm_EE_err2.result | ||
| rpl_stm_flsh_tbls.result | ||
| rpl_stm_insert_delayed.result | ||
| rpl_stm_log.result | ||
| rpl_stm_max_relay_size.result | ||
| rpl_stm_multi_query.result | ||
| rpl_stm_mystery22.result | ||
| rpl_stm_no_op.result | ||
| rpl_stm_reset_slave.result | ||
| rpl_stm_until.result | ||
| rpl_switch_stm_row_mixed.result | ||
| rpl_temp_table.result | ||
| rpl_temporary.result | ||
| rpl_temporary_errors.result | ||
| rpl_timezone.result | ||
| rpl_trigger.result | ||
| rpl_trunc_temp.result | ||
| rpl_truncate_2myisam.result | ||
| rpl_truncate_3innodb.result | ||
| rpl_truncate_7ndb_2.result | ||
| rpl_udf.result | ||
| rpl_user.result | ||
| rpl_user_variables.result | ||
| rpl_variables.result | ||
| rpl_variables_stm.result | ||
| rpl_view.result | ||