From 474fe6d9d9e0b4d8803bdf439dd017ba0c729729 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 27 Sep 2012 20:09:46 +0200 Subject: fixes for test failures and small collateral changes mysql-test/lib/My/Test.pm: somehow with "print" we get truncated writes sometimes mysql-test/suite/perfschema/r/digest_table_full.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/dml_handler.result: host table is not ported over yet mysql-test/suite/perfschema/r/information_schema.result: host table is not ported over yet mysql-test/suite/perfschema/r/nesting.result: this differs, because we don't rewrite general log queries, and multi-statement packets are logged as a one entry. this result file is identical to what mysql-5.6.5 produces with the --log-raw option. mysql-test/suite/perfschema/r/relaylog.result: MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB. mysql-test/suite/perfschema/r/server_init.result: MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup. mysql-test/suite/perfschema/r/stage_mdl_global.result: this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not do that, and this causes useless mutex locks and waits. mysql-test/suite/perfschema/r/statement_digest.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_consumers.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_long_query.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result: will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result: will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged --- mysql-test/suite/binlog/r/binlog_checksum.result | 4 +- mysql-test/suite/binlog/r/binlog_database.result | 18 +- .../binlog/r/binlog_delete_and_flush_index.result | 4 +- .../suite/binlog/r/binlog_drop_if_exists.result | 6 +- .../suite/binlog/r/binlog_implicit_commit.result | 133 +- mysql-test/suite/binlog/r/binlog_innodb.result | 8 +- mysql-test/suite/binlog/r/binlog_innodb_row.result | 8 +- mysql-test/suite/binlog/r/binlog_killed.result | 4 +- .../suite/binlog/r/binlog_killed_simulate.result | 2 +- mysql-test/suite/binlog/r/binlog_mdev342.result | 4 +- .../suite/binlog/r/binlog_mixed_load_data.result | 2 +- mysql-test/suite/binlog/r/binlog_row_binlog.result | 22 +- .../suite/binlog/r/binlog_row_ctype_ucs.result | 2 +- .../suite/binlog/r/binlog_row_drop_tbl.result | 2 +- .../suite/binlog/r/binlog_row_drop_tmp_tbl.result | 4 +- .../suite/binlog/r/binlog_row_insert_select.result | 5 +- .../binlog/r/binlog_row_mix_innodb_myisam.result | 80 +- .../r/binlog_statement_insert_delayed.result | 4 +- mysql-test/suite/binlog/r/binlog_stm_binlog.result | 26 +- .../suite/binlog/r/binlog_stm_blackhole.result | 2 +- .../suite/binlog/r/binlog_stm_ctype_ucs.result | 2 +- mysql-test/suite/binlog/r/binlog_stm_do_db.result | 2 +- .../suite/binlog/r/binlog_stm_drop_tbl.result | 2 +- .../suite/binlog/r/binlog_stm_drop_tmp_tbl.result | 4 +- .../suite/binlog/r/binlog_stm_insert_select.result | 5 +- .../binlog/r/binlog_stm_mix_innodb_myisam.result | 76 +- mysql-test/suite/binlog/r/binlog_stm_ps.result | 2 +- mysql-test/suite/binlog/r/binlog_stm_row.result | 2 +- .../binlog/r/binlog_stm_user_variables.result | 4 +- .../suite/binlog/r/binlog_truncate_myisam.result | 8 +- mysql-test/suite/binlog/r/binlog_unsafe.result | 6 +- mysql-test/suite/funcs_1/r/is_columns_mysql.result | 2 - .../funcs_1/r/processlist_priv_no_prot.result | 24 +- .../suite/funcs_1/r/processlist_val_no_prot.result | 10 +- mysql-test/suite/innodb/r/innodb.result | 4 +- .../suite/innodb/r/innodb_bug12661768.result | 2 +- mysql-test/suite/innodb/r/innodb_bug53592.result | 2 +- mysql-test/suite/innodb/t/innodb.test | 4 +- mysql-test/suite/innodb/t/innodb_bug12661768.test | 2 +- mysql-test/suite/innodb/t/innodb_bug53592.test | 2 +- mysql-test/suite/perfschema/disabled.def | 57 +- mysql-test/suite/perfschema/include/schema.inc | 1 + .../perfschema/include/start_server_common.inc | 1 + mysql-test/suite/perfschema/r/binlog_mix.result | 8 - mysql-test/suite/perfschema/r/binlog_row.result | 8 - mysql-test/suite/perfschema/r/binlog_stmt.result | 2 + .../suite/perfschema/r/digest_table_full.result | 2 +- mysql-test/suite/perfschema/r/dml_handler.result | 39 +- .../perfschema/r/dml_setup_instruments.result | 2 +- .../suite/perfschema/r/information_schema.result | 9 - mysql-test/suite/perfschema/r/misc.result | 4 +- mysql-test/suite/perfschema/r/nesting.result | 94 +- mysql-test/suite/perfschema/r/ortho_iter.result | 2 +- mysql-test/suite/perfschema/r/pfs_upgrade.result | 515 ++- mysql-test/suite/perfschema/r/privilege.result | 32 +- .../suite/perfschema/r/privilege_table_io.result | 2 +- mysql-test/suite/perfschema/r/relaylog.result | 25 +- .../suite/perfschema/r/rollback_table_io.result | 1 + mysql-test/suite/perfschema/r/schema.result | 34 +- mysql-test/suite/perfschema/r/server_init.result | 8 +- .../perfschema/r/setup_instruments_defaults.result | 1 - .../r/socket_summary_by_instance_func.result | 2 +- .../suite/perfschema/r/stage_mdl_global.result | 2 - .../perfschema/r/start_server_disable_idle.result | 2 +- .../r/start_server_disable_stages.result | 2 +- .../r/start_server_disable_statements.result | 2 +- .../perfschema/r/start_server_disable_waits.result | 2 +- .../suite/perfschema/r/start_server_innodb.result | 2 +- .../perfschema/r/start_server_no_account.result | 2 +- .../perfschema/r/start_server_no_cond_class.result | 2 +- .../perfschema/r/start_server_no_cond_inst.result | 2 +- .../perfschema/r/start_server_no_file_class.result | 2 +- .../perfschema/r/start_server_no_file_inst.result | 2 +- .../suite/perfschema/r/start_server_no_host.result | 2 +- .../r/start_server_no_mutex_class.result | 2 +- .../perfschema/r/start_server_no_mutex_inst.result | 2 +- .../r/start_server_no_rwlock_class.result | 2 +- .../r/start_server_no_rwlock_inst.result | 2 +- .../r/start_server_no_setup_actors.result | 2 +- .../r/start_server_no_setup_objects.result | 2 +- .../r/start_server_no_socket_class.result | 2 +- .../r/start_server_no_socket_inst.result | 2 +- .../r/start_server_no_stage_class.result | 2 +- .../r/start_server_no_stages_history.result | 2 +- .../r/start_server_no_stages_history_long.result | 2 +- .../r/start_server_no_statements_history.result | 2 +- .../start_server_no_statements_history_long.result | 2 +- .../perfschema/r/start_server_no_table_hdl.result | 2 +- .../perfschema/r/start_server_no_table_inst.result | 2 +- .../r/start_server_no_thread_class.result | 2 +- .../r/start_server_no_thread_inst.result | 2 +- .../suite/perfschema/r/start_server_no_user.result | 2 +- .../r/start_server_no_waits_history.result | 2 +- .../r/start_server_no_waits_history_long.result | 2 +- .../suite/perfschema/r/start_server_off.result | 2 +- .../suite/perfschema/r/start_server_on.result | 2 +- .../suite/perfschema/r/statement_digest.result | 44 +- .../perfschema/r/statement_digest_consumers.result | 44 +- .../r/statement_digest_long_query.result | 4 +- .../r/table_aggregate_global_2u_2t.result | 2 +- .../r/table_aggregate_global_2u_3t.result | 2 +- .../r/table_aggregate_global_4u_2t.result | 2 +- .../r/table_aggregate_global_4u_3t.result | 2 +- .../perfschema/r/table_aggregate_hist_2u_2t.result | 2 +- .../perfschema/r/table_aggregate_hist_2u_3t.result | 2 +- .../perfschema/r/table_aggregate_hist_4u_2t.result | 2 +- .../perfschema/r/table_aggregate_hist_4u_3t.result | 2 +- .../suite/perfschema/r/table_aggregate_off.result | 2 +- .../r/table_aggregate_thread_2u_2t.result | 2 +- .../r/table_aggregate_thread_2u_3t.result | 2 +- .../r/table_aggregate_thread_4u_2t.result | 2 +- .../r/table_aggregate_thread_4u_3t.result | 2 +- .../r/table_io_aggregate_global_2u_2t.result | 2 +- .../r/table_io_aggregate_global_2u_3t.result | 2 +- .../r/table_io_aggregate_global_4u_2t.result | 2 +- .../r/table_io_aggregate_global_4u_3t.result | 2 +- .../r/table_io_aggregate_hist_2u_2t.result | 2 +- .../r/table_io_aggregate_hist_2u_3t.result | 2 +- .../r/table_io_aggregate_hist_4u_2t.result | 2 +- .../r/table_io_aggregate_hist_4u_3t.result | 2 +- .../r/table_io_aggregate_thread_2u_2t.result | 2 +- .../r/table_io_aggregate_thread_2u_3t.result | 2 +- .../r/table_io_aggregate_thread_4u_2t.result | 2 +- .../r/table_io_aggregate_thread_4u_3t.result | 2 +- .../r/table_lock_aggregate_global_2u_2t.result | 2 +- .../r/table_lock_aggregate_global_2u_3t.result | 2 +- .../r/table_lock_aggregate_global_4u_2t.result | 2 +- .../r/table_lock_aggregate_global_4u_3t.result | 2 +- .../r/table_lock_aggregate_hist_2u_2t.result | 2 +- .../r/table_lock_aggregate_hist_2u_3t.result | 2 +- .../r/table_lock_aggregate_hist_4u_2t.result | 2 +- .../r/table_lock_aggregate_hist_4u_3t.result | 2 +- .../r/table_lock_aggregate_thread_2u_2t.result | 2 +- .../r/table_lock_aggregate_thread_2u_3t.result | 2 +- .../r/table_lock_aggregate_thread_4u_2t.result | 2 +- .../r/table_lock_aggregate_thread_4u_3t.result | 2 +- mysql-test/suite/perfschema/r/table_schema.result | 29 - mysql-test/suite/perfschema/t/innodb_table_io.test | 1 + mysql-test/suite/perfschema/t/misc.test | 1 + mysql-test/suite/perfschema/t/pfs_upgrade.test | 1 + .../suite/perfschema/t/rollback_table_io.test | 1 + .../suite/perfschema/t/socket_instances_func.test | 2 +- .../perfschema/t/socket_instances_func_win.test | 2 +- .../t/socket_summary_by_instance_func.test | 4 +- .../t/socket_summary_by_instance_func_win.test | 2 +- .../rpl/r/rpl_auto_increment_update_failure.result | 20 +- .../suite/rpl/r/rpl_begin_commit_rollback.result | 2 +- mysql-test/suite/rpl/r/rpl_binlog_errors.result | 2 +- mysql-test/suite/rpl/r/rpl_charset.result | 16 - .../suite/rpl/r/rpl_concurrency_error.result | 8 +- .../suite/rpl/r/rpl_conditional_comments.result | 6 +- .../suite/rpl/r/rpl_create_if_not_exists.result | 9 +- .../r/rpl_create_tmp_table_if_not_exists.result | 2 +- mysql-test/suite/rpl/r/rpl_do_grant.result | 2 +- mysql-test/suite/rpl/r/rpl_drop_temp.result | 2 +- mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result | 2 +- mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result | 3 +- .../suite/rpl/r/rpl_insert_delayed,stmt.rdiff | 2 +- mysql-test/suite/rpl/r/rpl_loaddata_map.result | 2 +- mysql-test/suite/rpl/r/rpl_loaddata_s.result | 3 +- .../rpl/r/rpl_mixed_binlog_max_cache_size.result | 3 +- .../rpl/r/rpl_mixed_drop_create_temp_table.result | 556 +++- .../rpl/r/rpl_mixed_implicit_commit_binlog.result | 41 + .../suite/rpl/r/rpl_mixed_mixing_engines.result | 3267 +++++++++++++------ .../r/rpl_non_direct_mixed_mixing_engines.result | 3267 +++++++++++++------ .../rpl/r/rpl_non_direct_row_mixing_engines.result | 3267 +++++++++++++------ .../rpl/r/rpl_non_direct_stm_mixing_engines.result | 3326 +++++++++++++------- mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result | 4 +- mysql-test/suite/rpl/r/rpl_replicate_do.result | 12 - mysql-test/suite/rpl/r/rpl_rewrt_db.result | 2 +- mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result | 4 +- .../rpl/r/rpl_row_binlog_max_cache_size.result | 3 +- mysql-test/suite/rpl/r/rpl_row_drop.result | 2 +- .../rpl/r/rpl_row_drop_create_temp_table.result | 578 +++- mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result | 2 +- .../rpl/r/rpl_row_implicit_commit_binlog.result | 41 + .../suite/rpl/r/rpl_row_loaddata_concurrent.result | 2 +- mysql-test/suite/rpl/r/rpl_row_log.result | 22 +- mysql-test/suite/rpl/r/rpl_row_log_innodb.result | 22 +- .../suite/rpl/r/rpl_row_mixing_engines.result | 3267 +++++++++++++------ .../rpl/r/rpl_row_show_relaylog_events.result | 68 +- mysql-test/suite/rpl/r/rpl_slave_skip.result | 4 +- mysql-test/suite/rpl/r/rpl_sp.result | 2 +- .../rpl/r/rpl_stm_auto_increment_bug33029.result | 4 +- .../rpl/r/rpl_stm_binlog_max_cache_size.result | 3 +- .../rpl/r/rpl_stm_drop_create_temp_table.result | 600 +++- mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result | 2 +- .../rpl/r/rpl_stm_implicit_commit_binlog.result | 41 + .../suite/rpl/r/rpl_stm_loaddata_concurrent.result | 2 +- mysql-test/suite/rpl/r/rpl_stm_log.result | 24 +- .../rpl/r/rpl_stm_mix_show_relaylog_events.result | 68 +- .../suite/rpl/r/rpl_stm_mixing_engines.result | 3280 +++++++++++++------ mysql-test/suite/rpl/r/rpl_stm_multi_query.result | 2 +- .../suite/rpl/r/rpl_temp_table_mix_row.result | 6 +- mysql-test/suite/rpl/r/rpl_user.result | 2 +- .../rpl/t/rpl_mixed_drop_create_temp_table.test | 2 +- .../suite/rpl/t/rpl_mixed_mixing_engines.test | 1 + .../rpl/t/rpl_non_direct_mixed_mixing_engines.test | 1 + .../rpl/t/rpl_non_direct_row_mixing_engines.test | 3 +- .../rpl/t/rpl_non_direct_stm_mixing_engines.test | 3 +- mysql-test/suite/rpl/t/rpl_replicate_do.test | 21 - .../rpl/t/rpl_row_drop_create_temp_table.test | 2 +- mysql-test/suite/rpl/t/rpl_row_mixing_engines.test | 4 +- mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test | 3 +- .../r/innodb_adaptive_max_sleep_delay_basic.result | 46 + .../r/innodb_analyze_is_persistent_basic.result | 103 + ...nnodb_buffer_pool_dump_at_shutdown_basic.result | 18 + .../r/innodb_buffer_pool_dump_now_basic.result | 8 + .../r/innodb_buffer_pool_filename_basic.result | 12 + .../r/innodb_buffer_pool_load_abort_basic.result | 8 + ...innodb_buffer_pool_load_at_startup_basic.result | 8 + .../r/innodb_buffer_pool_load_now_basic.result | 11 + .../r/innodb_change_buffer_max_size_basic.result | 77 + .../r/innodb_checksum_algorithm_basic.result | 47 + .../r/innodb_disable_sort_file_cache_basic.result | 92 + .../r/innodb_doublewrite_batch_size_basic.result | 24 + .../sys_vars/r/innodb_flush_neighbors_basic.result | 92 + .../sys_vars/r/innodb_ft_aux_table_basic.result | 32 + .../sys_vars/r/innodb_ft_cache_size_basic.result | 21 + .../r/innodb_ft_enable_diag_print_basic.result | 92 + .../r/innodb_ft_enable_stopword_basic.result | 121 + .../r/innodb_ft_max_token_size_basic.result | 21 + .../r/innodb_ft_min_token_size_basic.result | 21 + .../r/innodb_ft_num_word_optimize_basic.result | 56 + .../r/innodb_ft_server_stopword_table_basic.result | 32 + .../r/innodb_ft_sort_pll_degree_basic.result | 21 + .../r/innodb_ft_user_stopword_table_basic.result | 29 + .../sys_vars/r/innodb_lru_scan_depth_basic.result | 69 + .../r/innodb_max_purge_lag_delay_basic.result | 43 + .../sys_vars/r/innodb_monitor_disable_basic.result | 2180 +++++++++++++ .../sys_vars/r/innodb_monitor_enable_basic.result | 2180 +++++++++++++ .../r/innodb_monitor_reset_all_basic.result | 2180 +++++++++++++ .../sys_vars/r/innodb_monitor_reset_basic.result | 2180 +++++++++++++ .../r/innodb_optimize_fulltext_only_basic.result | 92 + .../sys_vars/r/innodb_page_hash_locks_basic.result | 24 + .../r/innodb_print_all_deadlocks_basic.result | 104 + .../r/innodb_purge_batch_size_basic.result | 8 +- .../r/innodb_sort_buffer_size_basic.result | 21 + ...nodb_stats_persistent_sample_pages_basic.result | 61 + .../r/innodb_stats_sample_pages_basic.result | 5 + ...nnodb_stats_transient_sample_pages_basic.result | 61 + .../sys_vars/r/innodb_sync_array_size_basic.result | 79 + .../sys_vars/r/innodb_undo_directory_basic.result | 48 + .../suite/sys_vars/r/innodb_undo_logs_basic.result | 68 + .../r/innodb_undo_tablespaces_basic.result | 38 + .../sys_vars/r/pfs_accounts_size_basic.result | 23 + .../suite/sys_vars/r/pfs_digests_size.result | 23 + ...fs_events_stages_history_long_size_basic.result | 23 + .../r/pfs_events_stages_history_size_basic.result | 23 + ...vents_statements_history_long_size_basic.result | 23 + ...pfs_events_statements_history_size_basic.result | 23 + .../suite/sys_vars/r/pfs_hosts_size_basic.result | 23 + .../sys_vars/r/pfs_max_socket_classes_basic.result | 23 + .../r/pfs_max_socket_instances_basic.result | 23 + .../sys_vars/r/pfs_max_stage_classes_basic.result | 23 + .../r/pfs_max_statement_classes_basic.result | 23 + .../sys_vars/r/pfs_setup_actors_size_basic.result | 23 + .../sys_vars/r/pfs_setup_objects_size_basic.result | 23 + .../suite/sys_vars/r/pfs_users_size_basic.result | 23 + mysql-test/suite/sys_vars/r/ssl_crl_basic.result | 5 + .../suite/sys_vars/r/ssl_crlpath_basic.result | 5 + .../suite/sys_vars/r/tx_read_only_basic.result | 181 ++ .../sys_vars/t/general_log_file_basic-master.opt | 3 +- .../sys_vars/t/general_log_file_func-master.opt | 3 +- .../t/innodb_adaptive_max_sleep_delay_basic.test | 75 + .../t/innodb_analyze_is_persistent_basic.test | 81 + .../innodb_buffer_pool_dump_at_shutdown_basic.test | 42 + .../t/innodb_buffer_pool_dump_now_basic.test | 25 + .../t/innodb_buffer_pool_filename_basic.test | 40 + .../t/innodb_buffer_pool_load_abort_basic.test | 15 + .../innodb_buffer_pool_load_at_startup_basic.test | 15 + .../t/innodb_buffer_pool_load_now_basic.test | 39 + .../t/innodb_change_buffer_max_size_basic.test | 63 + .../t/innodb_checksum_algorithm_basic.test | 38 + .../t/innodb_disable_sort_file_cache_basic.test | 70 + .../t/innodb_doublewrite_batch_size_basic.test | 22 + .../sys_vars/t/innodb_flush_neighbors_basic.test | 70 + .../sys_vars/t/innodb_ft_aux_table_basic.test | 41 + .../sys_vars/t/innodb_ft_cache_size_basic.test | 26 + .../t/innodb_ft_enable_diag_print_basic.test | 70 + .../t/innodb_ft_enable_stopword_basic.test | 85 + .../sys_vars/t/innodb_ft_max_token_size_basic.test | 26 + .../sys_vars/t/innodb_ft_min_token_size_basic.test | 26 + .../t/innodb_ft_num_word_optimize_basic.test | 52 + .../t/innodb_ft_server_stopword_table_basic.test | 41 + .../t/innodb_ft_sort_pll_degree_basic.test | 26 + .../t/innodb_ft_user_stopword_table_basic.test | 37 + .../sys_vars/t/innodb_lru_scan_depth_basic.test | 58 + .../t/innodb_max_purge_lag_delay_basic.test | 43 + .../sys_vars/t/innodb_monitor_disable_basic.test | 375 +++ .../sys_vars/t/innodb_monitor_enable_basic.test | 375 +++ .../sys_vars/t/innodb_monitor_reset_all_basic.test | 375 +++ .../sys_vars/t/innodb_monitor_reset_basic.test | 375 +++ .../t/innodb_optimize_fulltext_only_basic.test | 70 + .../sys_vars/t/innodb_page_hash_locks_basic.test | 22 + .../t/innodb_print_all_deadlocks_basic.test | 81 + .../sys_vars/t/innodb_sort_buffer_size_basic.test | 26 + ...innodb_stats_persistent_sample_pages_basic.test | 57 + .../innodb_stats_transient_sample_pages_basic.test | 57 + .../sys_vars/t/innodb_sync_array_size_basic.test | 66 + .../sys_vars/t/innodb_undo_directory_basic.test | 85 + .../suite/sys_vars/t/innodb_undo_logs_basic.test | 95 + .../sys_vars/t/innodb_undo_tablespaces_basic.test | 77 + .../sys_vars/t/pfs_accounts_size_basic-master.opt | 2 + .../suite/sys_vars/t/pfs_accounts_size_basic.test | 32 + .../sys_vars/t/pfs_digests_size-master_basic.opt | 2 + .../suite/sys_vars/t/pfs_digests_size_basic.test | 47 + ...vents_stages_history_long_size_basic-master.opt | 2 + .../pfs_events_stages_history_long_size_basic.test | 32 + ...pfs_events_stages_history_size_basic-master.opt | 2 + .../t/pfs_events_stages_history_size_basic.test | 32 + ...s_statements_history_long_size_basic-master.opt | 2 + ..._events_statements_history_long_size_basic.test | 32 + ...events_statements_history_size_basic-master.opt | 2 + .../pfs_events_statements_history_size_basic.test | 32 + .../sys_vars/t/pfs_hosts_size_basic-master.opt | 2 + .../suite/sys_vars/t/pfs_hosts_size_basic.test | 32 + .../t/pfs_max_socket_classes_basic-master.opt | 1 + .../sys_vars/t/pfs_max_socket_classes_basic.test | 32 + .../t/pfs_max_socket_instances_basic-master.opt | 1 + .../sys_vars/t/pfs_max_socket_instances_basic.test | 32 + .../t/pfs_max_stage_classes_basic-master.opt | 2 + .../sys_vars/t/pfs_max_stage_classes_basic.test | 32 + .../t/pfs_max_statement_classes_basic-master.opt | 2 + .../t/pfs_max_statement_classes_basic.test | 32 + .../t/pfs_setup_actors_size_basic-master.opt | 2 + .../sys_vars/t/pfs_setup_actors_size_basic.test | 32 + .../t/pfs_setup_objects_size_basic-master.opt | 2 + .../sys_vars/t/pfs_setup_objects_size_basic.test | 32 + .../sys_vars/t/pfs_users_size_basic-master.opt | 2 + .../suite/sys_vars/t/pfs_users_size_basic.test | 32 + .../sys_vars/t/rpl_max_binlog_size_func-master.opt | 3 +- mysql-test/suite/sys_vars/t/ssl_crl_basic.test | 3 + mysql-test/suite/sys_vars/t/ssl_crlpath_basic.test | 3 + .../suite/sys_vars/t/tx_read_only_basic.test | 199 ++ 335 files changed, 31041 insertions(+), 7418 deletions(-) create mode 100644 mysql-test/suite/sys_vars/r/innodb_adaptive_max_sleep_delay_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_analyze_is_persistent_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_at_shutdown_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_buffer_pool_dump_now_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_buffer_pool_filename_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_abort_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_at_startup_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_now_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_change_buffer_max_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_doublewrite_batch_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_flush_neighbors_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_ft_aux_table_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_ft_cache_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_ft_enable_diag_print_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_ft_enable_stopword_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_ft_max_token_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_ft_min_token_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_ft_num_word_optimize_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_ft_server_stopword_table_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_ft_sort_pll_degree_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_lru_scan_depth_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_max_purge_lag_delay_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_monitor_disable_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_optimize_fulltext_only_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_page_hash_locks_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_sort_buffer_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_stats_persistent_sample_pages_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_stats_transient_sample_pages_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_sync_array_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_undo_directory_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result create mode 100644 mysql-test/suite/sys_vars/r/innodb_undo_tablespaces_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_accounts_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_digests_size.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_events_stages_history_long_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_events_stages_history_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_events_statements_history_long_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_events_statements_history_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_hosts_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_max_socket_classes_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_max_socket_instances_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_max_stage_classes_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_max_statement_classes_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_setup_actors_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_setup_objects_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/pfs_users_size_basic.result create mode 100644 mysql-test/suite/sys_vars/r/ssl_crl_basic.result create mode 100644 mysql-test/suite/sys_vars/r/ssl_crlpath_basic.result create mode 100644 mysql-test/suite/sys_vars/r/tx_read_only_basic.result create mode 100644 mysql-test/suite/sys_vars/t/innodb_adaptive_max_sleep_delay_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_analyze_is_persistent_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_at_shutdown_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_now_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_buffer_pool_filename_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_abort_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_at_startup_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_change_buffer_max_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_checksum_algorithm_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_doublewrite_batch_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_flush_neighbors_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_ft_aux_table_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_ft_cache_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_ft_enable_diag_print_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_ft_enable_stopword_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_ft_max_token_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_ft_min_token_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_ft_num_word_optimize_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_ft_server_stopword_table_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_ft_sort_pll_degree_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_lru_scan_depth_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_max_purge_lag_delay_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_monitor_disable_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_monitor_enable_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_monitor_reset_all_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_monitor_reset_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_optimize_fulltext_only_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_page_hash_locks_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_sort_buffer_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_stats_persistent_sample_pages_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_stats_transient_sample_pages_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_sync_array_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_undo_directory_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test create mode 100644 mysql-test/suite/sys_vars/t/innodb_undo_tablespaces_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_accounts_size_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_accounts_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_digests_size-master_basic.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_digests_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_events_stages_history_long_size_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_events_stages_history_long_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_events_stages_history_size_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_events_stages_history_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_events_statements_history_long_size_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_events_statements_history_long_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_events_statements_history_size_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_events_statements_history_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_hosts_size_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_hosts_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_max_socket_instances_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_max_socket_instances_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_max_stage_classes_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_max_stage_classes_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_max_statement_classes_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_max_statement_classes_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_setup_objects_size_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_setup_objects_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/pfs_users_size_basic-master.opt create mode 100644 mysql-test/suite/sys_vars/t/pfs_users_size_basic.test create mode 100644 mysql-test/suite/sys_vars/t/ssl_crl_basic.test create mode 100644 mysql-test/suite/sys_vars/t/ssl_crlpath_basic.test create mode 100644 mysql-test/suite/sys_vars/t/tx_read_only_basic.test (limited to 'mysql-test/suite') diff --git a/mysql-test/suite/binlog/r/binlog_checksum.result b/mysql-test/suite/binlog/r/binlog_checksum.result index 44024456720..41d8e954e23 100644 --- a/mysql-test/suite/binlog/r/binlog_checksum.result +++ b/mysql-test/suite/binlog/r/binlog_checksum.result @@ -10,10 +10,10 @@ master-bin.000001 # create table t1 (a int); flush logs; drop table t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (a int) -master-bin.000001 # Rotate # # master-bin.000002;pos=4 +master-bin.000001 # Rotate # # master-bin.000002;pos=POS show tables; Tables_in_test t1 diff --git a/mysql-test/suite/binlog/r/binlog_database.result b/mysql-test/suite/binlog/r/binlog_database.result index 0eaed3c97d7..1fa3419738f 100644 --- a/mysql-test/suite/binlog/r/binlog_database.result +++ b/mysql-test/suite/binlog/r/binlog_database.result @@ -7,7 +7,7 @@ create function sf1 (a int) returns int return a+1; create trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a); create procedure sp1 (a int) insert into t1 values(a); drop database testing_1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # create database testing_1 master-bin.000001 # Query # # use `testing_1`; create table t1 (a int) @@ -25,7 +25,7 @@ insert into t1 values (1); drop database if exists mysqltest1; insert into t1 values (1); drop table tt1, t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create temporary table tt1 (a int) master-bin.000001 # Query # # use `test`; create table t1 (a int) @@ -56,7 +56,7 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail SHOW TABLES FROM db1; Tables_in_db1 t2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `db1`; drop table `t1` DROP TABLE t3; @@ -70,7 +70,7 @@ create function sf1 (a int) returns int return a+1; create trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a); create procedure sp1 (a int) insert into t1 values(a); drop database testing_1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # create database testing_1 master-bin.000001 # Query # # use `testing_1`; create table t1 (a int) @@ -88,7 +88,7 @@ insert into t1 values (1); drop database if exists mysqltest1; insert into t1 values (1); drop table tt1, t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create temporary table tt1 (a int) master-bin.000001 # Query # # use `test`; create table t1 (a int) @@ -119,7 +119,7 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail SHOW TABLES FROM db1; Tables_in_db1 t2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `db1`; drop table `t1` DROP TABLE t3; @@ -133,7 +133,7 @@ create function sf1 (a int) returns int return a+1; create trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a); create procedure sp1 (a int) insert into t1 values(a); drop database testing_1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # create database testing_1 master-bin.000001 # Query # # use `testing_1`; create table t1 (a int) @@ -151,7 +151,7 @@ insert into t1 values (1); drop database if exists mysqltest1; insert into t1 values (1); drop table tt1, t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (a int) master-bin.000001 # Query # # BEGIN @@ -183,7 +183,7 @@ ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fail SHOW TABLES FROM db1; Tables_in_db1 t2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `db1`; drop table `t1` DROP TABLE t3; diff --git a/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result b/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result index 036ccf131bb..a0f9f87d9db 100644 --- a/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result +++ b/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result @@ -11,7 +11,7 @@ show binary logs; Log_name File_size master-bin.000001 # ### assertion: binlog contents from regular entries -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a int) FLUSH LOGS; @@ -24,7 +24,7 @@ master-bin.000002 ### assertion: original binlog content still exists, despite we ### renamed and changed the index file -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin-b34582.000001 # Query # # use `test`; CREATE TABLE t1 (a int) ### assertion: user changed binlog index shows correct entries diff --git a/mysql-test/suite/binlog/r/binlog_drop_if_exists.result b/mysql-test/suite/binlog/r/binlog_drop_if_exists.result index 0c398bed440..e461a37c58b 100644 --- a/mysql-test/suite/binlog/r/binlog_drop_if_exists.result +++ b/mysql-test/suite/binlog/r/binlog_drop_if_exists.result @@ -6,7 +6,7 @@ DROP VIEW IF EXISTS db_bug_13684.v; DROP EVENT IF EXISTS db_bug_13684.e; DROP TABLE IF EXISTS db_bug_13684.t; DROP DATABASE IF EXISTS db_bug_13684; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f @@ -32,7 +32,7 @@ END; CREATE FUNCTION db_bug_13684.f (s CHAR(20)) RETURNS CHAR(50) DETERMINISTIC RETURN s; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f @@ -64,7 +64,7 @@ DROP VIEW IF EXISTS db_bug_13684.v; DROP EVENT IF EXISTS db_bug_13684.e; DROP TABLE IF EXISTS db_bug_13684.t; DROP DATABASE IF EXISTS db_bug_13684; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; DROP PROCEDURE IF EXISTS db_bug_13684.p master-bin.000001 # Query # # use `test`; DROP FUNCTION IF EXISTS db_bug_13684.f diff --git a/mysql-test/suite/binlog/r/binlog_implicit_commit.result b/mysql-test/suite/binlog/r/binlog_implicit_commit.result index ea43b31bde9..16f3ba3594c 100644 --- a/mysql-test/suite/binlog/r/binlog_implicit_commit.result +++ b/mysql-test/suite/binlog/r/binlog_implicit_commit.result @@ -3,10 +3,9 @@ SET BINLOG_FORMAT = STATEMENT; RESET MASTER; SET AUTOCOMMIT = 0; INSERT INTO t1 VALUES (1); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1) @@ -16,16 +15,15 @@ RESET MASTER; SET AUTOCOMMIT = 0; BEGIN; INSERT INTO t1 VALUES (2); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (2) master-bin.000001 # Xid # # COMMIT /* XID */ INSERT INTO t1 VALUES (3); -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (2) @@ -34,7 +32,7 @@ master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (3) master-bin.000001 # Xid # # COMMIT /* XID */ COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (2) @@ -46,13 +44,13 @@ COMMIT; RESET MASTER; SET AUTOCOMMIT = 1; INSERT INTO t1 VALUES (1); -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1) master-bin.000001 # Xid # # COMMIT /* XID */ SET AUTOCOMMIT = 1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1) @@ -62,16 +60,13 @@ RESET MASTER; SET AUTOCOMMIT = 1; BEGIN; INSERT INTO t1 VALUES (2); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 1; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc INSERT INTO t1 VALUES (3); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (2) @@ -81,26 +76,21 @@ COMMIT; RESET MASTER; SET AUTOCOMMIT = 0; INSERT INTO t1 VALUES (1); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 0; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc COMMIT; RESET MASTER; SET AUTOCOMMIT = 0; BEGIN; INSERT INTO t1 VALUES (2); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 0; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc INSERT INTO t1 VALUES (3); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (2) @@ -110,13 +100,13 @@ COMMIT; RESET MASTER; SET AUTOCOMMIT = 1; INSERT INTO t1 VALUES (1); -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1) master-bin.000001 # Xid # # COMMIT /* XID */ SET AUTOCOMMIT = 0; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (1) @@ -126,16 +116,13 @@ RESET MASTER; SET AUTOCOMMIT = 1; BEGIN; INSERT INTO t1 VALUES (2); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 0; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc INSERT INTO t1 VALUES (3); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 VALUES (2) @@ -146,10 +133,9 @@ SET BINLOG_FORMAT = ROW; RESET MASTER; SET AUTOCOMMIT = 0; INSERT INTO t1 VALUES (1); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -160,17 +146,16 @@ RESET MASTER; SET AUTOCOMMIT = 0; BEGIN; INSERT INTO t1 VALUES (2); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ INSERT INTO t1 VALUES (3); -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -181,7 +166,7 @@ master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -195,14 +180,14 @@ COMMIT; RESET MASTER; SET AUTOCOMMIT = 1; INSERT INTO t1 VALUES (1); -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ SET AUTOCOMMIT = 1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -213,16 +198,13 @@ RESET MASTER; SET AUTOCOMMIT = 1; BEGIN; INSERT INTO t1 VALUES (2); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 1; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc INSERT INTO t1 VALUES (3); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -234,26 +216,21 @@ COMMIT; RESET MASTER; SET AUTOCOMMIT = 0; INSERT INTO t1 VALUES (1); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 0; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc COMMIT; RESET MASTER; SET AUTOCOMMIT = 0; BEGIN; INSERT INTO t1 VALUES (2); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 0; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc INSERT INTO t1 VALUES (3); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -265,14 +242,14 @@ COMMIT; RESET MASTER; SET AUTOCOMMIT = 1; INSERT INTO t1 VALUES (1); -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ SET AUTOCOMMIT = 0; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -283,16 +260,13 @@ RESET MASTER; SET AUTOCOMMIT = 1; BEGIN; INSERT INTO t1 VALUES (2); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc SET AUTOCOMMIT = 0; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc INSERT INTO t1 VALUES (3); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -304,24 +278,23 @@ COMMIT; RESET MASTER; SET AUTOCOMMIT = 0; INSERT INTO t1 VALUES (1); -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc LOCK TABLES t1 WRITE; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ INSERT INTO t1 VALUES (2); -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ UNLOCK TABLES; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -332,7 +305,7 @@ master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) diff --git a/mysql-test/suite/binlog/r/binlog_innodb.result b/mysql-test/suite/binlog/r/binlog_innodb.result index cdb72aad902..d1991fff2c4 100644 --- a/mysql-test/suite/binlog/r/binlog_innodb.result +++ b/mysql-test/suite/binlog/r/binlog_innodb.result @@ -63,7 +63,7 @@ SET SESSION TRANSACTION ISOLATION LEVEL SERIALIZABLE; BEGIN; UPDATE t1 SET b = 4*a WHERE a > 4; COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b INT) ENGINE=INNODB master-bin.000001 # Query # # BEGIN @@ -157,8 +157,7 @@ a b 1 1 4 4 # There must no UPDATE in binlog; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc delete from t1; delete from t2; insert into t1 values (1,2),(3,4),(4,4); @@ -167,7 +166,6 @@ reset master; UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a; ERROR 23000: Duplicate entry '4' for key 'PRIMARY' # There must be no UPDATE query event; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc drop table t1, t2; End of tests diff --git a/mysql-test/suite/binlog/r/binlog_innodb_row.result b/mysql-test/suite/binlog/r/binlog_innodb_row.result index 61f961f16da..4f1ee073b6d 100644 --- a/mysql-test/suite/binlog/r/binlog_innodb_row.result +++ b/mysql-test/suite/binlog/r/binlog_innodb_row.result @@ -7,7 +7,7 @@ update t1 set i = 3 where i < 3; ERROR 23000: Duplicate entry '3' for key 'i' commit; *** Results of the test: the binlog must have only Write_rows events not any Update_rows *** -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -22,7 +22,7 @@ insert into t1 values (3),(4),(1),(2); ERROR 23000: Duplicate entry '1' for key 'i' commit; *** Results of the test: the binlog must have only one Write_rows event not two *** -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -38,7 +38,7 @@ DROP TABLE t1; ############################################### ### assertion: No event for 'TRUNCATE TABLE t2' ############################################### -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; CREATE TABLE t1 ( c1 int , primary key (c1)) ENGINE=InnoDB master-bin.000001 # Query # # BEGIN @@ -55,7 +55,7 @@ DROP TEMPORARY TABLE t1; ############################################### ### assertion: No event for 'TRUNCATE TABLE t1' ############################################### -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `t1` /* generated by server */ ############################################### diff --git a/mysql-test/suite/binlog/r/binlog_killed.result b/mysql-test/suite/binlog/r/binlog_killed.result index 4d4b8c4a26b..400c61c71f4 100644 --- a/mysql-test/suite/binlog/r/binlog_killed.result +++ b/mysql-test/suite/binlog/r/binlog_killed.result @@ -91,7 +91,7 @@ select @b /* must be 1 at the end of a stmt calling bug27563() */; @b 1 must have the update query event on the 4th line -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # User var # # @`b`=0 @@ -130,7 +130,7 @@ select @b /* must be 1 at the end of a stmt calling bug27563() */; @b 1 must have the delete query event on the 4th line -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # User var # # @`b`=0 diff --git a/mysql-test/suite/binlog/r/binlog_killed_simulate.result b/mysql-test/suite/binlog/r/binlog_killed_simulate.result index 52eb3c5a0a2..9547fdb88e0 100644 --- a/mysql-test/suite/binlog/r/binlog_killed_simulate.result +++ b/mysql-test/suite/binlog/r/binlog_killed_simulate.result @@ -16,7 +16,7 @@ create table t2 (a int, b int) ENGINE=MyISAM; reset master; load data infile '../../std_data/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */; ERROR 70100: Query execution was interrupted -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=# diff --git a/mysql-test/suite/binlog/r/binlog_mdev342.result b/mysql-test/suite/binlog/r/binlog_mdev342.result index 0e1d8f8ac78..9cb2b94f59d 100644 --- a/mysql-test/suite/binlog/r/binlog_mdev342.result +++ b/mysql-test/suite/binlog/r/binlog_mdev342.result @@ -18,7 +18,7 @@ show binary logs; Log_name File_size master-bin.000001 # master-bin.000002 # -show binlog events in 'master-bin.000001' from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Format_desc # # SERVER_VERSION, BINLOG_VERSION master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb @@ -26,5 +26,5 @@ master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ -master-bin.000001 # Rotate # # master-bin.000002;pos= +master-bin.000001 # Rotate # # master-bin.000002;pos=POS DROP TABLE t1; diff --git a/mysql-test/suite/binlog/r/binlog_mixed_load_data.result b/mysql-test/suite/binlog/r/binlog_mixed_load_data.result index 840257f11ff..306e48d4ea2 100644 --- a/mysql-test/suite/binlog/r/binlog_mixed_load_data.result +++ b/mysql-test/suite/binlog/r/binlog_mixed_load_data.result @@ -1,7 +1,7 @@ RESET MASTER; CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=MYISAM; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) diff --git a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result index 95477d13b50..b162e66137b 100644 --- a/mysql-test/suite/binlog/r/binlog_row_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result @@ -8,7 +8,7 @@ commit; begin; insert t2 values (5); commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (a int) engine=innodb master-bin.000001 # Query # # use `test`; create table t2 (a int) engine=innodb @@ -26,7 +26,7 @@ create table t1 (n int) engine=innodb; begin; commit; drop table t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (n int) engine=innodb master-bin.000001 # Query # # BEGIN @@ -231,8 +231,8 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ -master-bin.000001 # Rotate # # master-bin.000002;pos=4 -show binlog events in 'master-bin.000002' from ; +master-bin.000001 # Rotate # # master-bin.000002;pos=POS +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000002 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ set @ac = @@autocommit; @@ -245,7 +245,7 @@ insert into t1 values (2); insert into t1 values (3); commit; drop table t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1(n int) engine=innodb master-bin.000001 # Query # # BEGIN @@ -268,7 +268,7 @@ Binlog_cache_use 0 *** the following must show the counter value = 1 *** Variable_name Value Binlog_cache_use 1 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (a int, b char(255)) engine=innodb master-bin.000001 # Query # # use `test`; flush status @@ -474,7 +474,7 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ -master-bin.000001 # Rotate # # master-bin.000002;pos=4 +master-bin.000001 # Rotate # # master-bin.000002;pos=POS drop table t1; set global binlog_cache_size=@bcs; set session autocommit = @ac; @@ -487,7 +487,7 @@ set @b= 14632475938453979136; execute stmt using @a, @b; deallocate prepare stmt; drop table t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned) master-bin.000001 # Query # # BEGIN @@ -518,7 +518,7 @@ END// CALL p1(); c1 c2 c3 d1 d2 d3 utf8_general_ci utf8_unicode_ci utf8_unicode_ci 2 2 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci master-bin.000001 # Query # # use `bug39182`; CREATE TABLE t1 (a VARCHAR(255) COLLATE utf8_unicode_ci) @@ -595,7 +595,7 @@ INSERT INTO user SET host='localhost', user='@#@', password=password('Just a tes UPDATE user SET password=password('Another password') WHERE host='localhost' AND user='@#@'; DELETE FROM user WHERE host='localhost' AND user='@#@'; use test; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (id tinyint auto_increment primary key) master-bin.000001 # Query # # BEGIN @@ -630,7 +630,7 @@ insert /* before delayed */ delayed /* after delayed */ into t1 values (207); insert /*! delayed */ into t1 values (null); insert delayed into t1 values (300); FLUSH TABLES; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (id tinyint auto_increment primary key) master-bin.000001 # Query # # BEGIN diff --git a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result index f0519a9d724..733e5e1c0ab 100644 --- a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result @@ -3,7 +3,7 @@ create table t2 (c char(30)) charset=ucs2; set @v=convert('abc' using ucs2); reset master; insert into t2 values (@v); -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) diff --git a/mysql-test/suite/binlog/r/binlog_row_drop_tbl.result b/mysql-test/suite/binlog/r/binlog_row_drop_tbl.result index 15e6679fa25..0629c464beb 100644 --- a/mysql-test/suite/binlog/r/binlog_row_drop_tbl.result +++ b/mysql-test/suite/binlog/r/binlog_row_drop_tbl.result @@ -6,7 +6,7 @@ BEGIN; INSERT INTO t1 VALUES(1); DROP TABLE t1;; COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT) master-bin.000001 # Query # # BEGIN diff --git a/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result b/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result index d5986809a7c..2dd3890d575 100644 --- a/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result +++ b/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result @@ -23,7 +23,7 @@ USE test; SELECT GET_LOCK("a",10); GET_LOCK("a",10) 1 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # CREATE DATABASE `drop-temp+table-test` master-bin.000001 # Query # # use `drop-temp+table-test`; CREATE TABLE t(c1 int) @@ -45,7 +45,7 @@ INSERT INTO t1 VALUES ('1'); SELECT @@session.binlog_format; @@session.binlog_format ROW -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; CREATE TABLE t1 ( i text ) master-bin.000001 # Query # # BEGIN diff --git a/mysql-test/suite/binlog/r/binlog_row_insert_select.result b/mysql-test/suite/binlog/r/binlog_row_insert_select.result index 214a77dd36b..ce4e228ac62 100644 --- a/mysql-test/suite/binlog/r/binlog_row_insert_select.result +++ b/mysql-test/suite/binlog/r/binlog_row_insert_select.result @@ -6,7 +6,7 @@ insert into t2 values(1),(2); reset master; insert into t1 select * from t2; ERROR 23000: Duplicate entry '2' for key 'a' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -22,6 +22,5 @@ insert into t1 values(1),(1); reset master; create table t2(unique(a)) select a from t1; ERROR 23000: Duplicate entry '1' for key 'a' -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc drop table t1; diff --git a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result index 406b519aee8..96da28ae96e 100644 --- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result @@ -7,7 +7,7 @@ begin; insert into t1 values(1); insert into t2 select * from t1; commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -26,7 +26,7 @@ insert into t2 select * from t1; rollback; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -44,7 +44,7 @@ rollback to savepoint my_savepoint; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -75,7 +75,7 @@ select a from t1 order by a; a 5 7 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -103,7 +103,7 @@ insert into t2 select * from t1; select get_lock("a",10); get_lock("a",10) 1 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -114,7 +114,7 @@ delete from t2; reset master; insert into t1 values(9); insert into t2 select * from t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -130,7 +130,7 @@ reset master; insert into t1 values(10); begin; insert into t2 select * from t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -142,7 +142,7 @@ master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Query # # COMMIT insert into t1 values(11); commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -164,7 +164,7 @@ begin; insert into t1 values(12); insert into t2 select * from t1; commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -179,8 +179,7 @@ begin; insert into t1 values(13); insert into t2 select * from t1; rollback; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc delete from t1; delete from t2; reset master; @@ -191,11 +190,12 @@ insert into t1 values(15); insert into t2 select * from t1; rollback to savepoint my_savepoint; commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # SAVEPOINT `my_savepoint` master-bin.000001 # Xid # # COMMIT /* XID */ delete from t1; delete from t2; @@ -212,11 +212,12 @@ select a from t1 order by a; a 16 18 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # SAVEPOINT `my_savepoint` master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ @@ -265,11 +266,12 @@ insert into t2 values (3); select get_lock("lock1",60); get_lock("lock1",60) 1 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F +master-bin.000001 # Query # # SAVEPOINT `my_savepoint` master-bin.000001 # Table_map # # table_id: # (test.t1) master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F master-bin.000001 # Xid # # COMMIT /* XID */ @@ -382,7 +384,7 @@ SELECT * from t2; a b 100 100 DROP TABLE t1,t2; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -455,8 +457,7 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back select count(*) from tt /* 2 */; count(*) 2 -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc select count(*) from ti /* zero */; count(*) 0 @@ -476,8 +477,7 @@ ERROR 23000: Duplicate entry '2' for key 'a' rollback; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc select count(*) from ti /* zero */; count(*) 0 @@ -503,7 +503,7 @@ insert into t2 select bug27417(2); reset master; insert into t2 values (bug27417(2)); ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -522,7 +522,7 @@ delete from t2 where a=bug27417(3); select count(*) from t2 /* nothing got deleted */; count(*) 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -548,7 +548,7 @@ insert into t2 values (1); reset master; insert into t2 values (bug27417(1)); ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -564,7 +564,7 @@ insert into t2 values (2); reset master; insert into t2 select bug27417(1) union select bug27417(2); ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -579,7 +579,7 @@ insert into t3 values (1,1),(2,3),(3,4); reset master; update t3 set b=b+bug27417(1); ERROR 23000: Duplicate entry '4' for key 'b' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t3) @@ -599,7 +599,7 @@ insert into t4 values (1,1),(2,2); reset master; UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */; ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -631,7 +631,7 @@ insert into t3 values (bug27417(1), 2); reset master; delete from t2; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t3) @@ -653,7 +653,7 @@ insert into t5 values (1),(2); reset master; delete t2.* from t2,t5 where t2.a=t5.a + 1; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -675,7 +675,7 @@ a b select count(*) from t1 /* must be 2 */; count(*) 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -699,8 +699,7 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back select count(*) from tt /* 2 */; count(*) 2 -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc select count(*) from ti /* zero */; count(*) 0 @@ -720,8 +719,7 @@ ERROR 23000: Duplicate entry '2' for key 'a' rollback; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc select count(*) from ti /* zero */; count(*) 0 @@ -747,7 +745,7 @@ insert into t2 select bug27417(2); reset master; insert into t2 values (bug27417(2)); ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -765,7 +763,7 @@ delete from t2 where a=bug27417(3); select count(*) from t2 /* nothing got deleted */; count(*) 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -790,7 +788,7 @@ insert into t2 values (1); reset master; insert into t2 values (bug27417(1)); ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -805,7 +803,7 @@ insert into t2 values (2); reset master; insert into t2 select bug27417(1) union select bug27417(2); ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -819,7 +817,7 @@ insert into t3 values (1,1),(2,3),(3,4); reset master; update t3 set b=b+bug27417(1); ERROR 23000: Duplicate entry '4' for key 'b' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t3) @@ -838,7 +836,7 @@ insert into t4 values (1,1),(2,2); reset master; UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */; ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -869,7 +867,7 @@ insert into t3 values (bug27417(1), 2); reset master; delete from t2; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t3) @@ -890,7 +888,7 @@ insert into t5 values (1),(2); reset master; delete t2.* from t2,t5 where t2.a=t5.a + 1; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) @@ -911,7 +909,7 @@ a b select count(*) from t1 /* must be 2 */; count(*) 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) diff --git a/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result b/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result index cdcc96b94b0..1f4c138eb4e 100644 --- a/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result +++ b/mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result @@ -3,7 +3,7 @@ insert /* before delayed */ delayed /* after delayed */ into t1 values (207); insert /*! delayed */ into t1 values (null); insert delayed into t1 values (300); FLUSH TABLES; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_latin1'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'latin1_swedish_ci')) @@ -24,7 +24,7 @@ RESET MASTER; insert /* before delayed */ delayed /* after delayed */ into t1 values (null),(null),(null),(null); insert /*! delayed */ into t1 values (null),(null),(400),(null); FLUSH TABLES; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=301 diff --git a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result index 062f4f4e906..fd6a98cabc4 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result @@ -3,7 +3,7 @@ create table t1 (a int, b int) engine=innodb; begin; insert into t1 values (1,2); commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; create table t1 (a int, b int) engine=innodb @@ -21,7 +21,7 @@ commit; begin; insert t2 values (5); commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (a int) engine=innodb master-bin.000001 # Query # # use `test`; create table t2 (a int) engine=innodb @@ -37,7 +37,7 @@ create table t1 (n int) engine=innodb; begin; commit; drop table t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (n int) engine=innodb master-bin.000001 # Query # # BEGIN @@ -142,8 +142,8 @@ master-bin.000001 # Query # # use `test`; insert into t1 values(3 + 4) master-bin.000001 # Query # # use `test`; insert into t1 values(2 + 4) master-bin.000001 # Query # # use `test`; insert into t1 values(1 + 4) master-bin.000001 # Xid # # COMMIT /* XID */ -master-bin.000001 # Rotate # # master-bin.000002;pos=4 -show binlog events in 'master-bin.000002' from ; +master-bin.000001 # Rotate # # master-bin.000002;pos=POS +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000002 # Query # # use `test`; DROP TABLE `t1` /* generated by server */ set @ac = @@autocommit; @@ -156,7 +156,7 @@ insert into t1 values (2); insert into t1 values (3); commit; drop table t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1(n int) engine=innodb master-bin.000001 # Query # # BEGIN @@ -176,7 +176,7 @@ Binlog_cache_use 0 *** the following must show the counter value = 1 *** Variable_name Value Binlog_cache_use 1 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (a int, b char(255)) engine=innodb master-bin.000001 # Query # # use `test`; flush status @@ -282,7 +282,7 @@ master-bin.000001 # Query # # use `test`; insert into t1 values( 3, 'just to fil master-bin.000001 # Query # # use `test`; insert into t1 values( 2, 'just to fill void to make transaction occupying at least two buffers of the trans cache' ) master-bin.000001 # Query # # use `test`; insert into t1 values( 1, 'just to fill void to make transaction occupying at least two buffers of the trans cache' ) master-bin.000001 # Xid # # COMMIT /* XID */ -master-bin.000001 # Rotate # # master-bin.000002;pos=4 +master-bin.000001 # Rotate # # master-bin.000002;pos=POS drop table t1; set global binlog_cache_size=@bcs; set session autocommit = @ac; @@ -295,7 +295,7 @@ set @b= 14632475938453979136; execute stmt using @a, @b; deallocate prepare stmt; drop table t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned) master-bin.000001 # Query # # BEGIN @@ -325,7 +325,7 @@ END// CALL p1(); c1 c2 c3 d1 d2 d3 utf8_general_ci utf8_unicode_ci utf8_unicode_ci 2 2 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci master-bin.000001 # Query # # use `bug39182`; CREATE TABLE t1 (a VARCHAR(255) COLLATE utf8_unicode_ci) @@ -404,7 +404,7 @@ INSERT INTO user SET host='localhost', user='@#@', password=password('Just a tes UPDATE user SET password=password('Another password') WHERE host='localhost' AND user='@#@'; DELETE FROM user WHERE host='localhost' AND user='@#@'; use test; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (id tinyint auto_increment primary key) master-bin.000001 # Query # # BEGIN @@ -431,7 +431,7 @@ insert /* before delayed */ delayed /* after delayed */ into t1 values (207); insert /*! delayed */ into t1 values (null); insert delayed into t1 values (300); FLUSH TABLES; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (id tinyint auto_increment primary key) master-bin.000001 # Query # # BEGIN @@ -452,7 +452,7 @@ master-bin.000001 # Query # # COMMIT master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `mysql`; DELETE FROM user WHERE host='localhost' AND user='@#@' master-bin.000001 # Query # # COMMIT -master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE `tt1` /* generated by server */ +master-bin.000001 # Query # # use `test`; DROP TEMPORARY TABLE IF EXISTS `tt1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE `t1`,`t2`,`t3` /* generated by server */ master-bin.000001 # Query # # use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam master-bin.000001 # Query # # BEGIN diff --git a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result index e76f6b494f9..755fd3e3761 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_blackhole.result +++ b/mysql-test/suite/binlog/r/binlog_stm_blackhole.result @@ -107,7 +107,7 @@ select * from t2; a select * from t3; a -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; DROP TABLE `t1`,`t2` /* generated by server */ master-bin.000001 # Query # # use `test`; create table t1 (a int) engine=blackhole diff --git a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result index 4bdafb609a7..796e6d0588f 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result +++ b/mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result @@ -3,7 +3,7 @@ create table t2 (c char(30)) charset=ucs2; set @v=convert('abc' using ucs2); reset master; insert into t2 values (@v); -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # User var # # @`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci diff --git a/mysql-test/suite/binlog/r/binlog_stm_do_db.result b/mysql-test/suite/binlog/r/binlog_stm_do_db.result index 279ccc059b9..ec3092da6da 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_do_db.result +++ b/mysql-test/suite/binlog/r/binlog_stm_do_db.result @@ -32,7 +32,7 @@ INSERT INTO t1 SELECT * FROM t2; ERROR HY000: Cannot execute statement: impossible to write to binary log since BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine limited to row-based logging. InnoDB is limited to row-logging when transaction isolation level is READ COMMITTED or READ UNCOMMITTED. COMMIT; ### assertion: filtered events did not make into the binlog -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # CREATE DATABASE b42829 master-bin.000001 # Query # # use `b42829`; CREATE TABLE t1 (x int, y int) engine=InnoDB diff --git a/mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result b/mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result index 3355396aa49..eade2af04c6 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result +++ b/mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result @@ -6,7 +6,7 @@ BEGIN; INSERT INTO t1 VALUES(1); DROP TABLE t1;; COMMIT; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a INT) master-bin.000001 # Query # # BEGIN diff --git a/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result b/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result index 9c5575840d0..04e2482ceb8 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result +++ b/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result @@ -23,7 +23,7 @@ USE test; SELECT GET_LOCK("a",10); GET_LOCK("a",10) 1 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # CREATE DATABASE `drop-temp+table-test` master-bin.000001 # Query # # use `drop-temp+table-test`; CREATE TEMPORARY TABLE shortn1 (a INT) @@ -52,7 +52,7 @@ INSERT INTO t1 VALUES ('1'); SELECT @@session.binlog_format; @@session.binlog_format ROW -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; CREATE TABLE t1 ( i text ) master-bin.000001 # Query # # use `test`; CREATE TEMPORARY TABLE ttmp1 ( i text ) diff --git a/mysql-test/suite/binlog/r/binlog_stm_insert_select.result b/mysql-test/suite/binlog/r/binlog_stm_insert_select.result index 72036d89b9e..4221ec1ae1b 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_insert_select.result +++ b/mysql-test/suite/binlog/r/binlog_stm_insert_select.result @@ -6,7 +6,7 @@ insert into t2 values(1),(2); reset master; insert into t1 select * from t2; ERROR 23000: Duplicate entry '2' for key 'a' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 select * from t2 @@ -21,6 +21,5 @@ insert into t1 values(1),(1); reset master; create table t2(unique(a)) select a from t1; ERROR 23000: Duplicate entry '1' for key 'a' -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc drop table t1; diff --git a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result index da2e24506fd..d7148ea0293 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result @@ -10,7 +10,7 @@ insert into t2 select * from t1; Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as transactional or temporary table, and writes to any of them. commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(1) @@ -27,7 +27,7 @@ Note 1592 Unsafe statement written to the binary log using statement format sinc rollback; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(2) @@ -47,7 +47,7 @@ rollback to savepoint my_savepoint; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(3) @@ -75,7 +75,7 @@ select a from t1 order by a; a 5 7 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(5) @@ -99,7 +99,7 @@ Note 1592 Unsafe statement written to the binary log using statement format sinc select get_lock("a",10); get_lock("a",10) 1 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(8) @@ -110,7 +110,7 @@ delete from t2; reset master; insert into t1 values(9); insert into t2 select * from t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(9) @@ -124,7 +124,7 @@ reset master; insert into t1 values(10); begin; insert into t2 select * from t1; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(10) @@ -134,7 +134,7 @@ master-bin.000001 # Query # # use `test`; insert into t2 select * from t1 master-bin.000001 # Query # # COMMIT insert into t1 values(11); commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(10) @@ -153,7 +153,7 @@ begin; insert into t1 values(12); insert into t2 select * from t1; commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(12) @@ -166,8 +166,7 @@ begin; insert into t1 values(13); insert into t2 select * from t1; rollback; -show binlog events from ; -Log_name Pos Event_type Server_id End_log_pos Info +include/show_binlog_events.inc delete from t1; delete from t2; reset master; @@ -178,10 +177,11 @@ insert into t1 values(15); insert into t2 select * from t1; rollback to savepoint my_savepoint; commit; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(14) +master-bin.000001 # Query # # SAVEPOINT `my_savepoint` master-bin.000001 # Xid # # COMMIT /* XID */ delete from t1; delete from t2; @@ -198,10 +198,11 @@ select a from t1 order by a; a 16 18 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(16) +master-bin.000001 # Query # # SAVEPOINT `my_savepoint` master-bin.000001 # Query # # use `test`; insert into t1 values(18) master-bin.000001 # Xid # # COMMIT /* XID */ delete from t1; @@ -251,10 +252,11 @@ insert into t2 values (3); select get_lock("lock1",60); get_lock("lock1",60) 1 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into t1 values(16) +master-bin.000001 # Query # # SAVEPOINT `my_savepoint` master-bin.000001 # Query # # use `test`; insert into t1 values(18) master-bin.000001 # Xid # # COMMIT /* XID */ master-bin.000001 # Query # # BEGIN @@ -378,7 +380,7 @@ SELECT * from t2; a b 100 100 DROP TABLE t1,t2; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t1 values (1,1),(1,2) @@ -461,7 +463,7 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back select count(*) from tt /* 2 */; count(*) 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into ti values (1) @@ -487,7 +489,7 @@ ERROR 23000: Duplicate entry '2' for key 'a' rollback; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into ti values (1) @@ -523,7 +525,7 @@ Note 1592 Unsafe statement written to the binary log using statement format sinc reset master; insert into t2 values (bug27417(2)); ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=3 @@ -543,7 +545,7 @@ Note 1592 Unsafe statement written to the binary log using statement format sinc select count(*) from t2 /* nothing got deleted */; count(*) 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=4 @@ -570,7 +572,7 @@ insert into t2 values (1); reset master; insert into t2 values (bug27417(1)); ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=1 @@ -586,7 +588,7 @@ insert into t2 values (2); reset master; insert into t2 select bug27417(1) union select bug27417(2); ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=2 @@ -601,7 +603,7 @@ insert into t3 values (1,1),(2,3),(3,4); reset master; update t3 set b=b+bug27417(1); ERROR 23000: Duplicate entry '4' for key 'b' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=4 @@ -618,7 +620,7 @@ insert into t4 values (1,1),(2,2); reset master; UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */; ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=6 @@ -650,7 +652,7 @@ insert into t3 values (bug27417(1), 2); reset master; delete from t2; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=9 @@ -671,7 +673,7 @@ insert into t5 values (1),(2); reset master; delete t2.* from t2,t5 where t2.a=t5.a + 1; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; delete t2.* from t2,t5 where t2.a=t5.a + 1 @@ -692,7 +694,7 @@ a b select count(*) from t1 /* must be 2 */; count(*) 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=10 @@ -719,7 +721,7 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back select count(*) from tt /* 2 */; count(*) 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into ti values (1) @@ -745,7 +747,7 @@ ERROR 23000: Duplicate entry '2' for key 'a' rollback; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; insert into ti values (1) @@ -781,7 +783,7 @@ Note 1592 Unsafe statement written to the binary log using statement format sinc reset master; insert into t2 values (bug27417(2)); ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=3 @@ -800,7 +802,7 @@ Note 1592 Unsafe statement written to the binary log using statement format sinc select count(*) from t2 /* nothing got deleted */; count(*) 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=4 @@ -826,7 +828,7 @@ insert into t2 values (1); reset master; insert into t2 values (bug27417(1)); ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=1 @@ -841,7 +843,7 @@ insert into t2 values (2); reset master; insert into t2 select bug27417(1) union select bug27417(2); ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=2 @@ -855,7 +857,7 @@ insert into t3 values (1,1),(2,3),(3,4); reset master; update t3 set b=b+bug27417(1); ERROR 23000: Duplicate entry '4' for key 'b' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=4 @@ -871,7 +873,7 @@ insert into t4 values (1,1),(2,2); reset master; UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */; ERROR 23000: Duplicate entry '2' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=6 @@ -902,7 +904,7 @@ insert into t3 values (bug27417(1), 2); reset master; delete from t2; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=9 @@ -922,7 +924,7 @@ insert into t5 values (1),(2); reset master; delete t2.* from t2,t5 where t2.a=t5.a + 1; ERROR 23000: Duplicate entry '1' for key 'PRIMARY' -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; delete t2.* from t2,t5 where t2.a=t5.a + 1 @@ -942,7 +944,7 @@ a b select count(*) from t1 /* must be 2 */; count(*) 2 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Intvar # # INSERT_ID=10 diff --git a/mysql-test/suite/binlog/r/binlog_stm_ps.result b/mysql-test/suite/binlog/r/binlog_stm_ps.result index 36b84d7d148..0a42c78706a 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_ps.result +++ b/mysql-test/suite/binlog/r/binlog_stm_ps.result @@ -12,7 +12,7 @@ set @a=100; execute s using @a; Warnings: Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted. -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; create table t1 (a int) master-bin.000001 # Query # # BEGIN diff --git a/mysql-test/suite/binlog/r/binlog_stm_row.result b/mysql-test/suite/binlog/r/binlog_stm_row.result index 58911374e6d..c2b8dace6d4 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_row.result +++ b/mysql-test/suite/binlog/r/binlog_stm_row.result @@ -57,7 +57,7 @@ RELEASE_LOCK('Bug#34306') # con2 # default # Show binlog events -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */ master-bin.000001 # Query # # use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */ diff --git a/mysql-test/suite/binlog/r/binlog_stm_user_variables.result b/mysql-test/suite/binlog/r/binlog_stm_user_variables.result index 92a74f63ad9..a51b21e915e 100644 --- a/mysql-test/suite/binlog/r/binlog_stm_user_variables.result +++ b/mysql-test/suite/binlog/r/binlog_stm_user_variables.result @@ -37,7 +37,7 @@ INSERT INTO t1 VALUES (@positive, ## assertion: checks that User_var_log_event::pack_info ## correctly displays the binlog content by taking into ## account the unsigned_flag -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (`tinyint` TINYINT, `smallint` SMALLINT, @@ -96,7 +96,7 @@ INSERT INTO t1 VALUES (@negative, ## assertion: checks that User_var_log_event::pack_info ## correctly displays the binlog content by taking into ## account the unsigned_flag -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (`tinyint` TINYINT, `smallint` SMALLINT, diff --git a/mysql-test/suite/binlog/r/binlog_truncate_myisam.result b/mysql-test/suite/binlog/r/binlog_truncate_myisam.result index 1f5b206fd6f..2b7bd101397 100644 --- a/mysql-test/suite/binlog/r/binlog_truncate_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_truncate_myisam.result @@ -7,7 +7,7 @@ INSERT INTO t2 VALUES (1),(2),(3); **** Truncate of empty table shall be logged TRUNCATE TABLE t1; TRUNCATE TABLE t2; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1 master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t2 @@ -38,7 +38,7 @@ SELECT COUNT(*) FROM t2; COUNT(*) 4 # Connection: default -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -58,7 +58,7 @@ INSERT INTO t2 VALUES (1),(2),(3); **** Truncate of empty table shall be logged TRUNCATE TABLE t1; TRUNCATE TABLE t2; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t1 master-bin.000001 # Query # # use `test`; TRUNCATE TABLE t2 @@ -89,7 +89,7 @@ SELECT COUNT(*) FROM t2; COUNT(*) 4 # Connection: default -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT INTO t2 SELECT * FROM t1 diff --git a/mysql-test/suite/binlog/r/binlog_unsafe.result b/mysql-test/suite/binlog/r/binlog_unsafe.result index 2cc1ebdd2d7..b69dcb642b8 100644 --- a/mysql-test/suite/binlog/r/binlog_unsafe.result +++ b/mysql-test/suite/binlog/r/binlog_unsafe.result @@ -2515,7 +2515,7 @@ CALL proc_insert_delayed(); SELECT func_limit(); func_limit() 1 -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Query # # use `test`; INSERT DELAYED INTO t1 VALUES (1), (2) @@ -2545,7 +2545,7 @@ Note 1592 Unsafe statement written to the binary log using statement format sinc SET SESSION binlog_format = MIXED; # Check if the statement is logged in row format. INSERT INTO t2 SET a = func_modify_t1(); -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t2) @@ -2572,7 +2572,7 @@ Note 1592 Unsafe statement written to the binary log using statement format sinc SET SESSION binlog_format = MIXED; # Check if the statement is logged in row format. INSERT INTO t1 SET a = 2; -show binlog events from ; +include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 # Query # # BEGIN master-bin.000001 # Table_map # # table_id: # (test.t1) diff --git a/mysql-test/suite/funcs_1/r/is_columns_mysql.result b/mysql-test/suite/funcs_1/r/is_columns_mysql.result index 30c9b74d9a3..074a1089e52 100644 --- a/mysql-test/suite/funcs_1/r/is_columns_mysql.result +++ b/mysql-test/suite/funcs_1/r/is_columns_mysql.result @@ -152,7 +152,6 @@ def mysql servers Username 4 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci def mysql servers Wrapper 8 NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) select,insert,update,references def mysql slave_master_info Bind 18 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references Displays which interface is employed when connecting to the MySQL server def mysql slave_master_info Connect_retry 9 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references The period (in seconds) that the slave will wait before trying to reconnect to the master. -def mysql slave_master_info Enabled_auto_position 24 NULL NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) select,insert,update,references Indicates whether GTIDs will be used to retrieve events from the master. def mysql slave_master_info Enabled_ssl 10 NULL NO tinyint NULL NULL 3 0 NULL NULL NULL tinyint(1) select,insert,update,references Indicates whether the server supports SSL connections. def mysql slave_master_info Heartbeat 17 NULL NO float NULL NULL 12 NULL NULL NULL NULL float select,insert,update,references def mysql slave_master_info Host 5 NULL YES text 65535 65535 NULL NULL NULL utf8 utf8_bin text select,insert,update,references The host name of the master. @@ -512,7 +511,6 @@ NULL mysql slave_master_info Heartbeat float NULL NULL NULL NULL float NULL mysql slave_master_info Retry_count bigint NULL NULL NULL NULL bigint(20) unsigned 1.0000 mysql slave_master_info Ssl_crl text 65535 65535 utf8 utf8_bin text 1.0000 mysql slave_master_info Ssl_crlpath text 65535 65535 utf8 utf8_bin text -NULL mysql slave_master_info Enabled_auto_position tinyint NULL NULL NULL NULL tinyint(1) NULL mysql slave_relay_log_info Master_id int NULL NULL NULL NULL int(10) unsigned NULL mysql slave_relay_log_info Number_of_lines int NULL NULL NULL NULL int(10) unsigned 1.0000 mysql slave_relay_log_info Relay_log_name text 65535 65535 utf8 utf8_bin text diff --git a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result index 2112da6761e..24be300fd51 100644 --- a/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result +++ b/mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result @@ -37,7 +37,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ) DEFAULT CHARSET=utf8 SHOW processlist; Id User Host db Command Time State Info Progress -ID root HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID root HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS SELECT * FROM processlist ORDER BY id; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS @@ -110,7 +110,7 @@ PROCESSLIST CREATE TEMPORARY TABLE `PROCESSLIST` ( ) DEFAULT CHARSET=utf8 SHOW processlist; Id User Host db Command Time State Info Progress -ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM processlist ORDER BY id; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM processlist ORDER BY id TIME_MS 0 0 0.000 @@ -173,7 +173,7 @@ Grants for ddicttestuser1@localhost GRANT PROCESS ON *.* TO 'ddicttestuser1'@'localhost' IDENTIFIED BY PASSWORD '*22DA61451703738F203CDB9DB041ACBA1F4760B1' SHOW processlist; Id User Host db Command Time State Info Progress -ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 @@ -188,7 +188,7 @@ SHOW processlist; Id User Host db Command Time State Info Progress ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 @@ -212,7 +212,7 @@ Id User Host db Command Time State Info Progress ID root HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 @@ -236,7 +236,7 @@ SHOW processlist; Id User Host db Command Time State Info Progress ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 @@ -276,7 +276,7 @@ Id User Host db Command Time State Info Progress ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 @@ -302,7 +302,7 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 @@ -356,7 +356,7 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser2 HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID ddicttestuser2 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID ddicttestuser2 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 @@ -385,7 +385,7 @@ GRANT USAGE ON *.* TO 'ddicttestuser2'@'localhost' IDENTIFIED BY PASSWORD '*22DA SHOW processlist; Id User Host db Command Time State Info Progress ID ddicttestuser2 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser2 HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID ddicttestuser2 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID ddicttestuser2 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 @@ -414,7 +414,7 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 @@ -450,7 +450,7 @@ ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS ID ddicttestuser1 HOST_NAME information_schema Sleep TIME NULL TIME_MS -ID ddicttestuser1 HOST_NAME information_schema Query TIME NULL SHOW processlist TIME_MS +ID ddicttestuser1 HOST_NAME information_schema Query TIME init SHOW processlist TIME_MS SELECT * FROM information_schema.processlist; ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS ID ddicttestuser1 HOST_NAME information_schema Query TIME executing SELECT * FROM information_schema.processlist TIME_MS 0 0 0.000 diff --git a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result index 0893fa3ca20..ee575777b3d 100644 --- a/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result +++ b/mysql-test/suite/funcs_1/r/processlist_val_no_prot.result @@ -33,7 +33,7 @@ ID USER HOST DB COMMAND TIME STATE INFO TIME_MS STAGE MAX_STAGE PROGRESS root test Query