diff --git a/mysql-test/main/alter_table_online_debug.opt b/mysql-test/main/alter_table_online_debug.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/alter_table_online_debug.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/bootstrap.opt b/mysql-test/main/bootstrap.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/bootstrap.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/bootstrap_innodb.opt b/mysql-test/main/bootstrap_innodb.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/bootstrap_innodb.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/cast.opt b/mysql-test/main/cast.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/cast.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/change_master_default.opt b/mysql-test/main/change_master_default.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/change_master_default.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/change_master_default.result b/mysql-test/main/change_master_default.result index 9178c395339fb..87b0c4e6e6738 100644 --- a/mysql-test/main/change_master_default.result +++ b/mysql-test/main/change_master_default.result @@ -205,7 +205,7 @@ CHANGE MASTER 'unset' TO master_host='127.0.1.3'; # restart_abort: --master-heartbeat-period=123abc # restart_abort: --master-heartbeat-period=-1 # restart_abort: --master-heartbeat-period=4294967.296 -# restart: --skip-slave-start --master-heartbeat-period=0.000499 +# restart: --skip-slave-start --master-heartbeat-period=0 SELECT connection_name, slave_heartbeat_period FROM information_schema.slave_status ORDER BY connection_name; connection_name slave_heartbeat_period diff --git a/mysql-test/main/change_master_default.test b/mysql-test/main/change_master_default.test index a4e25c8d86992..27e4bab042c90 100644 --- a/mysql-test/main/change_master_default.test +++ b/mysql-test/main/change_master_default.test @@ -121,7 +121,8 @@ CHANGE MASTER 'unset' TO master_host='127.0.1.3'; --write_line "$restart_parameters" $_expect_file_name # Numbers between 0 and 0.5 exclusive should warn about rounding to 0 (disabled) ---let $restart_parameters= --skip-slave-start --master-heartbeat-period=0.000499 +# Explicitly set period to 0 to ensure the result is 0.000 regardless of env +--let $restart_parameters= --skip-slave-start --master-heartbeat-period=0 --source include/start_mysqld.inc SELECT connection_name, slave_heartbeat_period FROM information_schema.slave_status ORDER BY connection_name; diff --git a/mysql-test/main/ctype_utf16.opt b/mysql-test/main/ctype_utf16.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/ctype_utf16.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/explain.opt b/mysql-test/main/explain.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/explain.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/func_compress.opt b/mysql-test/main/func_compress.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/func_compress.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/func_hybrid_type.opt b/mysql-test/main/func_hybrid_type.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/func_hybrid_type.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/func_json.opt b/mysql-test/main/func_json.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/func_json.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/func_json_notembedded.opt b/mysql-test/main/func_json_notembedded.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/func_json_notembedded.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/func_math.opt b/mysql-test/main/func_math.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/func_math.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/func_str.opt b/mysql-test/main/func_str.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/func_str.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/func_weight_string.opt b/mysql-test/main/func_weight_string.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/func_weight_string.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/huge_frm-6224.opt b/mysql-test/main/huge_frm-6224.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/huge_frm-6224.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/long_unique_big.opt b/mysql-test/main/long_unique_big.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/long_unique_big.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/my_print_defaults.opt b/mysql-test/main/my_print_defaults.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/my_print_defaults.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/mysql-bug41486.opt b/mysql-test/main/mysql-bug41486.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/mysql-bug41486.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/mysql-bug45236.opt b/mysql-test/main/mysql-bug45236.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/mysql-bug45236.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/mysqlbinlog_row_big.opt b/mysql-test/main/mysqlbinlog_row_big.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/mysqlbinlog_row_big.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index cb87a7ba8f1e6..cc2702cdd8988 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1773,7 +1773,7 @@ binlog-large-commit-threshold 134217728 binlog-legacy-event-pos FALSE binlog-optimize-thread-scheduling TRUE binlog-row-event-fragment-threshold 1073741824 -binlog-row-event-max-size 8192 +binlog-row-event-max-size 65536 binlog-row-image FULL binlog-row-metadata NO_LOG binlog-space-limit 0 diff --git a/mysql-test/main/mysqld_option_err.opt b/mysql-test/main/mysqld_option_err.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/mysqld_option_err.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/natural_sort_key.opt b/mysql-test/main/natural_sort_key.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/natural_sort_key.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/packet.opt b/mysql-test/main/packet.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/packet.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/selectivity_innodb.opt b/mysql-test/main/selectivity_innodb.opt new file mode 100644 index 0000000000000..c17d50256392a --- /dev/null +++ b/mysql-test/main/selectivity_innodb.opt @@ -0,0 +1,2 @@ +--loose-binlog-row-event-max-size=8192 +--sql-mode=NO_ENGINE_SUBSTITUTION diff --git a/mysql-test/main/subselect.opt b/mysql-test/main/subselect.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/subselect.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/tmp_space_usage.opt b/mysql-test/main/tmp_space_usage.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/tmp_space_usage.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/union.opt b/mysql-test/main/union.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/union.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/user_var.opt b/mysql-test/main/user_var.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/user_var.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/variables-notembedded.opt b/mysql-test/main/variables-notembedded.opt index c648e504c97af..0608f34aa4413 100644 --- a/mysql-test/main/variables-notembedded.opt +++ b/mysql-test/main/variables-notembedded.opt @@ -1,2 +1,4 @@ --loose-slave-skip-errors=3,100,137,0,643,1752 --old-mode=no_dup_key_warnings_with_ignore,compat_5_1_checksum + +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/variables.opt b/mysql-test/main/variables.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/variables.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/vector.opt b/mysql-test/main/vector.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/main/vector.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/main/xa.opt b/mysql-test/main/xa.opt new file mode 100644 index 0000000000000..059d3ff3f180e --- /dev/null +++ b/mysql-test/main/xa.opt @@ -0,0 +1,3 @@ +--loose-binlog-row-event-max-size=8192 +--innodb-lock-wait-timeout=10 +--loose-debug-gdb diff --git a/mysql-test/main/xa.test b/mysql-test/main/xa.test index feb55da0e0ea5..017333790d36a 100644 --- a/mysql-test/main/xa.test +++ b/mysql-test/main/xa.test @@ -79,6 +79,7 @@ xa start 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz'; select * from t1; disconnect con1; +--sleep 1 xa rollback 'testb',0x2030405060,11; xa recover; @@ -731,6 +732,8 @@ xa end '4'; xa prepare '4'; disconnect con2_ro; +--sleep 1 + connection default; xa recover; --error ER_XA_RBROLLBACK @@ -771,7 +774,7 @@ xa end 'r:foo'; xa prepare 'r:foo'; disconnect con1; connection default; ---source include/wait_until_count_sessions.inc +--sleep 1 xa recover; xa start 'r:bar'; diff --git a/mysql-test/suite/binlog/include/binlog.opt b/mysql-test/suite/binlog/include/binlog.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/binlog/include/binlog.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/binlog/include/binlog_cache_stat.opt b/mysql-test/suite/binlog/include/binlog_cache_stat.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/binlog/include/binlog_cache_stat.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/binlog/t/binlog_bug23533.opt b/mysql-test/suite/binlog/t/binlog_bug23533.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/binlog/t/binlog_bug23533.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/binlog/t/flashback-largebinlog.opt b/mysql-test/suite/binlog/t/flashback-largebinlog.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/binlog/t/flashback-largebinlog.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/binlog_encryption/rpl_packet.cnf b/mysql-test/suite/binlog_encryption/rpl_packet.cnf index 0f01aec743763..61c6a69258688 100644 --- a/mysql-test/suite/binlog_encryption/rpl_packet.cnf +++ b/mysql-test/suite/binlog_encryption/rpl_packet.cnf @@ -3,8 +3,10 @@ [mysqld.1] max_allowed_packet=1024 net_buffer_length=1024 +binlog_row_event_max_size=8192 [mysqld.2] max_allowed_packet=1024 net_buffer_length=1024 slave_max_allowed_packet=1024 +binlog_row_event_max_size=8192 diff --git a/mysql-test/suite/binlog_in_engine/innodb_log_check.opt b/mysql-test/suite/binlog_in_engine/innodb_log_check.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/binlog_in_engine/innodb_log_check.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/binlog_in_engine/rpl_dual_cache-master.opt b/mysql-test/suite/binlog_in_engine/rpl_dual_cache-master.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/binlog_in_engine/rpl_dual_cache-master.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/binlog_in_engine/rpl_oob.opt b/mysql-test/suite/binlog_in_engine/rpl_oob.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/binlog_in_engine/rpl_oob.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/binlog_in_engine/xa.opt b/mysql-test/suite/binlog_in_engine/xa.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/binlog_in_engine/xa.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/encryption/t/tempfiles.opt b/mysql-test/suite/encryption/t/tempfiles.opt index 2b90f47442837..a8b3e4d0a207c 100644 --- a/mysql-test/suite/encryption/t/tempfiles.opt +++ b/mysql-test/suite/encryption/t/tempfiles.opt @@ -1 +1,3 @@ --encrypt-tmp-files + +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/events/events_restart-master.opt b/mysql-test/suite/events/events_restart-master.opt index f93413a61e559..3b25409054f8e 100644 --- a/mysql-test/suite/events/events_restart-master.opt +++ b/mysql-test/suite/events/events_restart-master.opt @@ -1 +1,2 @@ --event-scheduler +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/galera/t/galera_binlog_cache_size.opt b/mysql-test/suite/galera/t/galera_binlog_cache_size.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/galera/t/galera_binlog_cache_size.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/innodb/t/innodb_bug34300.opt b/mysql-test/suite/innodb/t/innodb_bug34300.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/innodb/t/innodb_bug34300.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/innodb/t/skip_locked_nowait.opt b/mysql-test/suite/innodb/t/skip_locked_nowait.opt new file mode 100644 index 0000000000000..c98e96ccccecf --- /dev/null +++ b/mysql-test/suite/innodb/t/skip_locked_nowait.opt @@ -0,0 +1,2 @@ +--loose-binlog-row-event-max-size=8192 +--innodb-lock-wait-timeout=30 \ No newline at end of file diff --git a/mysql-test/suite/maria/maria-big.opt b/mysql-test/suite/maria/maria-big.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/maria/maria-big.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/perfschema/t/io_cache.opt b/mysql-test/suite/perfschema/t/io_cache.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/perfschema/t/io_cache.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/perfschema/t/user_var_func.opt b/mysql-test/suite/perfschema/t/user_var_func.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/perfschema/t/user_var_func.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/plugins/t/auth_ed25519.opt b/mysql-test/suite/plugins/t/auth_ed25519.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/plugins/t/auth_ed25519.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/plugins/t/auth_ed25519.test b/mysql-test/suite/plugins/t/auth_ed25519.test index a69d8e59ae767..b4594c813d26c 100644 --- a/mysql-test/suite/plugins/t/auth_ed25519.test +++ b/mysql-test/suite/plugins/t/auth_ed25519.test @@ -63,9 +63,11 @@ replace_result $MASTER_MYSOCK MASTER_MYSOCK $MASTER_MYPORT MASTER_MYPORT; error ER_ACCESS_DENIED_ERROR; connect con3, localhost, test2, "wrong_pwd"; connection default; +--disable_warnings drop user test2@localhost; drop user test1@localhost; +--enable_warnings uninstall plugin ed25519; error ER_CANT_INITIALIZE_UDF; select ed25519_password("foo"); diff --git a/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_row-master.opt b/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_row-master.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_row-master.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_binlog_rollback_cleanup.opt b/mysql-test/suite/rpl/t/rpl_binlog_rollback_cleanup.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_binlog_rollback_cleanup.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_checksum_cache.opt b/mysql-test/suite/rpl/t/rpl_checksum_cache.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_checksum_cache.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_create_select_row.opt b/mysql-test/suite/rpl/t/rpl_create_select_row.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_create_select_row.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_fragment_row_event_main-master.opt b/mysql-test/suite/rpl/t/rpl_fragment_row_event_main-master.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_fragment_row_event_main-master.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_fragment_row_event_main-slave.opt b/mysql-test/suite/rpl/t/rpl_fragment_row_event_main-slave.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_fragment_row_event_main-slave.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_fragment_row_event_main.opt b/mysql-test/suite/rpl/t/rpl_fragment_row_event_main.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_fragment_row_event_main.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_fragment_row_event_mysqlbinlog.opt b/mysql-test/suite/rpl/t/rpl_fragment_row_event_mysqlbinlog.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_fragment_row_event_mysqlbinlog.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_loaddata_map.opt b/mysql-test/suite/rpl/t/rpl_loaddata_map.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_loaddata_map.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_mdev-11092.opt b/mysql-test/suite/rpl/t/rpl_mdev-11092.opt index 7f1d270d29f2b..487fc2c199527 100644 --- a/mysql-test/suite/rpl/t/rpl_mdev-11092.opt +++ b/mysql-test/suite/rpl/t/rpl_mdev-11092.opt @@ -1 +1,3 @@ --binlog_checksum=1 --binlog-annotate-row-events=1 + +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_packet-master.opt b/mysql-test/suite/rpl/t/rpl_packet-master.opt index 412bc079caa79..c70297576c5d3 100644 --- a/mysql-test/suite/rpl/t/rpl_packet-master.opt +++ b/mysql-test/suite/rpl/t/rpl_packet-master.opt @@ -1 +1,2 @@ --max_allowed_packet=1024 --net_buffer_length=1024 +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_packet-slave.opt b/mysql-test/suite/rpl/t/rpl_packet-slave.opt index 1aed7d07572ae..09c7de5030a8b 100644 --- a/mysql-test/suite/rpl/t/rpl_packet-slave.opt +++ b/mysql-test/suite/rpl/t/rpl_packet-slave.opt @@ -1 +1,2 @@ --max_allowed_packet=1024 --net_buffer_length=1024 --slave_max_allowed_packet=1024 +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_packet.opt b/mysql-test/suite/rpl/t/rpl_packet.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_packet.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_row_binlog_tmp_file_flush_enospc.opt b/mysql-test/suite/rpl/t/rpl_row_binlog_tmp_file_flush_enospc.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_row_binlog_tmp_file_flush_enospc.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_row_end_of_statement_loss-master.opt b/mysql-test/suite/rpl/t/rpl_row_end_of_statement_loss-master.opt index 144bbca073039..693171a30b92d 100644 --- a/mysql-test/suite/rpl/t/rpl_row_end_of_statement_loss-master.opt +++ b/mysql-test/suite/rpl/t/rpl_row_end_of_statement_loss-master.opt @@ -1,2 +1,2 @@ ---binlog-row-event-max-size=8192 +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_row_foreign_key_mdl-master.opt b/mysql-test/suite/rpl/t/rpl_row_foreign_key_mdl-master.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_row_foreign_key_mdl-master.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_row_foreign_key_mdl-slave.opt b/mysql-test/suite/rpl/t/rpl_row_foreign_key_mdl-slave.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_row_foreign_key_mdl-slave.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/rpl/t/rpl_row_foreign_key_mdl.opt b/mysql-test/suite/rpl/t/rpl_row_foreign_key_mdl.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/rpl/t/rpl_row_foreign_key_mdl.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/r/binlog_row_event_max_size_basic.result b/mysql-test/suite/sys_vars/r/binlog_row_event_max_size_basic.result new file mode 100644 index 0000000000000..856b3db1dedc0 --- /dev/null +++ b/mysql-test/suite/sys_vars/r/binlog_row_event_max_size_basic.result @@ -0,0 +1,9 @@ +# Suppress the expected warning for the .opt file adjustment +CALL mtr.add_suppression("option 'binlog_row_event_max_size': unsigned value 4300000000 adjusted to .*"); +# Verify Read-Only Status +SET @@global.binlog_row_event_max_size= 4096; +ERROR HY000: Variable 'binlog_row_event_max_size' is a read only variable +# Verify Maximum Clipping from .opt file +SELECT @@global.binlog_row_event_max_size; +@@global.binlog_row_event_max_size +4294967040 diff --git a/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.opt b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_basic.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/t/binlog_cache_size_grant.opt b/mysql-test/suite/sys_vars/t/binlog_cache_size_grant.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/binlog_cache_size_grant.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/t/binlog_row_event_max_size_basic-master.opt b/mysql-test/suite/sys_vars/t/binlog_row_event_max_size_basic-master.opt new file mode 100644 index 0000000000000..98f0b2057b929 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/binlog_row_event_max_size_basic-master.opt @@ -0,0 +1 @@ +--binlog-row-event-max-size=4300000000 diff --git a/mysql-test/suite/sys_vars/t/binlog_row_event_max_size_basic.test b/mysql-test/suite/sys_vars/t/binlog_row_event_max_size_basic.test new file mode 100644 index 0000000000000..e5a9432a41c24 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/binlog_row_event_max_size_basic.test @@ -0,0 +1,17 @@ +# +# MDEV-37608: Increase default binlog_row_event_max_size to 64k +# +--source include/have_binlog_format_row.inc + +--echo # Suppress the expected warning for the .opt file adjustment +# This handles the "adjusted to 4294967040" warning found in the log. +CALL mtr.add_suppression("option 'binlog_row_event_max_size': unsigned value 4300000000 adjusted to .*"); + +--echo # Verify Read-Only Status +# Confirming that runtime changes are rejected. +--error ER_INCORRECT_GLOBAL_LOCAL_VAR +SET @@global.binlog_row_event_max_size= 4096; + +--echo # Verify Maximum Clipping from .opt file +# This SELECT confirms the server correctly handled the extreme .opt value. +SELECT @@global.binlog_row_event_max_size; \ No newline at end of file diff --git a/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.opt b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/binlog_stmt_cache_size_basic.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/t/general_log_func.opt b/mysql-test/suite/sys_vars/t/general_log_func.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/general_log_func.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.opt b/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/t/max_allowed_packet_func.opt b/mysql-test/suite/sys_vars/t/max_allowed_packet_func.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/max_allowed_packet_func.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.opt b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/t/max_binlog_cache_size_grant.opt b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_grant.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/max_binlog_cache_size_grant.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/t/net_buffer_length_basic.opt b/mysql-test/suite/sys_vars/t/net_buffer_length_basic.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/net_buffer_length_basic.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_basic.opt b/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_basic.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_basic.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_grant.opt b/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_grant.opt new file mode 100644 index 0000000000000..e668cf4965963 --- /dev/null +++ b/mysql-test/suite/sys_vars/t/slave_max_allowed_packet_grant.opt @@ -0,0 +1 @@ +--loose-binlog-row-event-max-size=8192 diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 53b9c7b864ed7..e555bb202c769 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -6071,7 +6071,7 @@ static Sys_var_ulong Sys_opt_binlog_rows_event_max_size( "grouped into events smaller than this size if possible. " "The value has to be a multiple of 256", READ_ONLY GLOBAL_VAR(opt_binlog_rows_event_max_size), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(256, UINT_MAX32 - (UINT_MAX32 % 256)), DEFAULT(8192), + VALID_RANGE(256, UINT_MAX32 - (UINT_MAX32 % 256)), DEFAULT(65536), BLOCK_SIZE(256)); static Sys_var_uint Sys_opt_binlog_partial_rows_event_max_size(