MDEV-7635: Part 1

innodb_autoinc_lock_mode            = 2
innodb_buffer_pool_dump_at_shutdown = ON
innodb_buffer_pool_dump_pct         = 25
innodb_buffer_pool_load_at_startup  = ON
innodb_checksum_algorithm           = CRC32
innodb_file_format                  = Barracuda
innodb_large_prefix                 = ON
innodb_log_compressed_pages         = ON
innodb_purge_threads                = 4
innodb_strict_mode                  = ON
binlog_annotate_row_events          = ON
binlog_format                       = MIXED
binlog-row-event-max-size           = 8192
group_concat_max_len                = 1M
lock_wait_timeout                   = 86400
log_slow_admin_statements           = ON
log_slow_slave_statements           = ON
log_warnings                        = 2
max_allowed_packet                  = 16M
replicate_annotate_row_events       = ON
slave_net_timeout                   = 60
sync_binlog                         = 1
aria_recover                        = BACKUP,QUICK
myisam_recover_options              = BACKUP,QUICK

17 files changed, 132 insertions, 132 deletions

diff --git a/mysql-test/suite/sys_vars/r/aria_recover_options_basic.result b/mysql-test/suite/sys_vars/r/aria_recover_options_basic.result
index 04c45aa0dbb..0399b531eeb 100644
--- a/mysql-test/suite/sys_vars/r/aria_recover_options_basic.result
+++ b/mysql-test/suite/sys_vars/r/aria_recover_options_basic.result
@@ -1,21 +1,21 @@
 SET @start_global_value = @@global.aria_recover_options;
 select @@global.aria_recover_options;
 @@global.aria_recover_options
-NORMAL
+BACKUP,QUICK
 select @@session.aria_recover_options;
 ERROR HY000: Variable 'aria_recover_options' is a GLOBAL variable
 show global variables like 'aria_recover_options';
 Variable_name	Value
-aria_recover_options	NORMAL
+aria_recover_options	BACKUP,QUICK
 show session variables like 'aria_recover_options';
 Variable_name	Value
-aria_recover_options	NORMAL
+aria_recover_options	BACKUP,QUICK
 select * from information_schema.global_variables where variable_name='aria_recover_options';
 VARIABLE_NAME	VARIABLE_VALUE
-ARIA_RECOVER_OPTIONS	NORMAL
+ARIA_RECOVER_OPTIONS	BACKUP,QUICK
 select * from information_schema.session_variables where variable_name='aria_recover_options';
 VARIABLE_NAME	VARIABLE_VALUE
-ARIA_RECOVER_OPTIONS	NORMAL
+ARIA_RECOVER_OPTIONS	BACKUP,QUICK
 set global aria_recover_options=1;
 select @@global.aria_recover_options;
 @@global.aria_recover_options
diff --git a/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_basic.result b/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_basic.result
index 6fef4fc1d32..cfebfe905b1 100644
--- a/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_basic.result
+++ b/mysql-test/suite/sys_vars/r/binlog_annotate_row_events_basic.result
@@ -1,22 +1,22 @@
 SET @start_global_value = @@global.binlog_annotate_row_events;
 select @@global.binlog_annotate_row_events;
 @@global.binlog_annotate_row_events
-0
+1
 select @@session.binlog_annotate_row_events;
 @@session.binlog_annotate_row_events
-0
+1
 show global variables like 'binlog_annotate_row_events';
 Variable_name	Value
-binlog_annotate_row_events	OFF
+binlog_annotate_row_events	ON
 show session variables like 'binlog_annotate_row_events';
 Variable_name	Value
-binlog_annotate_row_events	OFF
+binlog_annotate_row_events	ON
 select * from information_schema.global_variables where variable_name='binlog_annotate_row_events';
 VARIABLE_NAME	VARIABLE_VALUE
-BINLOG_ANNOTATE_ROW_EVENTS	OFF
+BINLOG_ANNOTATE_ROW_EVENTS	ON
 select * from information_schema.session_variables where variable_name='binlog_annotate_row_events';
 VARIABLE_NAME	VARIABLE_VALUE
-BINLOG_ANNOTATE_ROW_EVENTS	OFF
+BINLOG_ANNOTATE_ROW_EVENTS	ON
 set global binlog_annotate_row_events=ON;
 select @@global.binlog_annotate_row_events;
 @@global.binlog_annotate_row_events
diff --git a/mysql-test/suite/sys_vars/r/binlog_format_basic.result b/mysql-test/suite/sys_vars/r/binlog_format_basic.result
index 0d76d9686e3..a14fb505e6d 100644
--- a/mysql-test/suite/sys_vars/r/binlog_format_basic.result
+++ b/mysql-test/suite/sys_vars/r/binlog_format_basic.result
@@ -1,6 +1,6 @@
 SELECT @@GLOBAL.binlog_format;
 @@GLOBAL.binlog_format
-STATEMENT
+MIXED
 '#---------------------BS_STVARS_002_01----------------------#'
 SET @start_value= @@global.binlog_format;
 SELECT COUNT(@@GLOBAL.binlog_format);
diff --git a/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result b/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
index 48126d33ee8..fa1cc5554b0 100644
--- a/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
+++ b/mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
@@ -1,22 +1,22 @@
 SET @start_global_value = @@global.group_concat_max_len;
 SELECT @start_global_value;
 @start_global_value
-1024
+1048576
 SET @start_session_value = @@session.group_concat_max_len;
 SELECT @start_session_value;
 @start_session_value
-1024
+1048576
 '#--------------------FN_DYNVARS_034_01-------------------------#'
 SET @@global.group_concat_max_len = 100;
 SET @@global.group_concat_max_len = DEFAULT;
 SELECT @@global.group_concat_max_len;
 @@global.group_concat_max_len
-1024
+1048576
 SET @@session.group_concat_max_len = 200;
 SET @@session.group_concat_max_len = DEFAULT;
 SELECT @@session.group_concat_max_len;
 @@session.group_concat_max_len
-1024
+1048576
 '#--------------------FN_DYNVARS_034_02-------------------------#'
 SET @@global.group_concat_max_len = DEFAULT;
 SELECT @@global.group_concat_max_len = 1;
@@ -160,8 +160,8 @@ ERROR 42S22: Unknown column 'group_concat_max_len' in 'field list'
 SET @@global.group_concat_max_len = @start_global_value;
 SELECT @@global.group_concat_max_len;
 @@global.group_concat_max_len
-1024
+1048576
 SET @@session.group_concat_max_len = @start_session_value;
 SELECT @@session.group_concat_max_len;
 @@session.group_concat_max_len
-1024
+1048576
diff --git a/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result b/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result
index 3b1ad38fd31..8cb8d900b59 100644
--- a/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result
+++ b/mysql-test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result
@@ -1,7 +1,7 @@
 SET @start_global_value = @@global.innodb_log_compressed_pages;
 SELECT @start_global_value;
 @start_global_value
-0
+1
 '#---------------------BS_STVARS_028_01----------------------#'
 SELECT COUNT(@@GLOBAL.innodb_log_compressed_pages);
 COUNT(@@GLOBAL.innodb_log_compressed_pages)
@@ -66,4 +66,4 @@ ERROR 42S22: Unknown column 'innodb_log_compressed_pages' in 'field list'
 SET @@global.innodb_log_compressed_pages = @start_global_value;
 SELECT @@global.innodb_log_compressed_pages;
 @@global.innodb_log_compressed_pages
-0
+1
diff --git a/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result b/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result
index 6d1e8d3bb59..bc127bf339a 100644
--- a/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/lock_wait_timeout_basic.result
@@ -1,31 +1,31 @@
 SET @start_global_value = @@global.lock_wait_timeout;
 SELECT @start_global_value;
 @start_global_value
-31536000
+86400
 SET @start_session_value = @@session.lock_wait_timeout;
 SELECT @start_session_value;
 @start_session_value
-31536000
+86400
 '#--------------------FN_DYNVARS_002_01-------------------------#'
 SET @@global.lock_wait_timeout = 100;
 SET @@global.lock_wait_timeout = DEFAULT;
 SELECT @@global.lock_wait_timeout;
 @@global.lock_wait_timeout
-31536000
+86400
 SET @@session.lock_wait_timeout = 200;
 SET @@session.lock_wait_timeout = DEFAULT;
 SELECT @@session.lock_wait_timeout;
 @@session.lock_wait_timeout
-31536000
+86400
 '#--------------------FN_DYNVARS_002_02-------------------------#'
 SET @@global.lock_wait_timeout = @start_global_value;
 SELECT @@global.lock_wait_timeout = 31536000;
 @@global.lock_wait_timeout = 31536000
-1
+0
 SET @@session.lock_wait_timeout = @start_session_value;
 SELECT @@session.lock_wait_timeout = 31536000;
 @@session.lock_wait_timeout = 31536000
-1
+0
 '#--------------------FN_DYNVARS_002_03-------------------------#'
 SET @@global.lock_wait_timeout = 1;
 SELECT @@global.lock_wait_timeout;
@@ -170,8 +170,8 @@ ERROR 42S22: Unknown column 'lock_wait_timeout' in 'field list'
 SET @@global.lock_wait_timeout = @start_global_value;
 SELECT @@global.lock_wait_timeout;
 @@global.lock_wait_timeout
-31536000
+86400
 SET @@session.lock_wait_timeout = @start_session_value;
 SELECT @@session.lock_wait_timeout;
 @@session.lock_wait_timeout
-31536000
+86400
diff --git a/mysql-test/suite/sys_vars/r/log_warnings_basic.result b/mysql-test/suite/sys_vars/r/log_warnings_basic.result
index fee7f8966ca..eac8949f7c6 100644
--- a/mysql-test/suite/sys_vars/r/log_warnings_basic.result
+++ b/mysql-test/suite/sys_vars/r/log_warnings_basic.result
@@ -1,31 +1,31 @@
 SET @start_global_value = @@global.log_warnings;
 SELECT @start_global_value;
 @start_global_value
-1
+2
 SET @start_session_value = @@session.log_warnings;
 SELECT @start_session_value;
 @start_session_value
-1
+2
 '#--------------------FN_DYNVARS_067_01-------------------------#'
 SET @@global.log_warnings = 100;
 SET @@global.log_warnings = DEFAULT;
 SELECT @@global.log_warnings;
 @@global.log_warnings
-1
+2
 SET @@session.log_warnings = 200;
 SET @@session.log_warnings = DEFAULT;
 SELECT @@session.log_warnings;
 @@session.log_warnings
-1
+2
 '#--------------------FN_DYNVARS_067_02-------------------------#'
 SET @@global.log_warnings = DEFAULT;
 SELECT @@global.log_warnings = 1;
 @@global.log_warnings = 1
-1
+0
 SET @@session.log_warnings = DEFAULT;
 SELECT @@session.log_warnings = 1;
 @@session.log_warnings = 1
-1
+0
 '#--------------------FN_DYNVARS_067_03-------------------------#'
 SET @@global.log_warnings = 0;
 SELECT @@global.log_warnings;
@@ -158,8 +158,8 @@ ERROR 42S22: Unknown column 'log_warnings' in 'field list'
 SET @@global.log_warnings = @start_global_value;
 SELECT @@global.log_warnings;
 @@global.log_warnings
-1
+2
 SET @@session.log_warnings = @start_session_value;
 SELECT @@session.log_warnings;
 @@session.log_warnings
-1
+2
diff --git a/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
index ec99256a862..10bda48dd43 100644
--- a/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
+++ b/mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
@@ -1,7 +1,7 @@
 SET @start_global_value = @@global.max_allowed_packet;
 SELECT @start_global_value;
 @start_global_value
-4194304
+16777216
 SET @@global.max_allowed_packet = DEFAULT;
 connect  conn1, localhost, root,,;
 '#--------------------FN_DYNVARS_070_01-------------------------#'
@@ -12,14 +12,14 @@ Warning	1708	The value of 'max_allowed_packet' should be no less than the value
 SET @@global.max_allowed_packet = DEFAULT;
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet
-4194304
+16777216
 SET @@session.max_allowed_packet = 20000;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SET @@session.max_allowed_packet = DEFAULT;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 '#--------------------FN_DYNVARS_070_02-------------------------#'
 SET @@global.max_allowed_packet = DEFAULT;
 SELECT @@global.max_allowed_packet = 1048576;
@@ -54,27 +54,27 @@ SET @@session.max_allowed_packet = 1024;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 SET @@session.max_allowed_packet = 1025;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 SET @@session.max_allowed_packet = 65535;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 SET @@session.max_allowed_packet = 1073741824;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 SET @@session.max_allowed_packet = 1073741823;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 '#------------------FN_DYNVARS_070_05-----------------------#'
 SET @@global.max_allowed_packet = 0;
 Warnings:
@@ -117,29 +117,29 @@ SET @@session.max_allowed_packet = 0;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 SET @@session.max_allowed_packet = 1023;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 SET @@session.max_allowed_packet = -2;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 SET @@session.max_allowed_packet = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'max_allowed_packet'
 SET @@session.max_allowed_packet = 10737418241;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 SET @@session.max_allowed_packet = test;
 ERROR 42000: Incorrect argument type to variable 'max_allowed_packet'
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 '#------------------FN_DYNVARS_070_06-----------------------#'
 SELECT @@global.max_allowed_packet = VARIABLE_VALUE 
 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
@@ -188,7 +188,7 @@ SET max_allowed_packet = 1024;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@max_allowed_packet;
 @@max_allowed_packet
-4194304
+16777216
 SELECT local.max_allowed_packet;
 ERROR 42S02: Unknown table 'local' in field list
 SELECT session.max_allowed_packet;
@@ -199,7 +199,7 @@ connection default;
 SET @@global.max_allowed_packet = @start_global_value;
 SELECT @@global.max_allowed_packet;
 @@global.max_allowed_packet
-4194304
+16777216
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
diff --git a/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result b/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result
index c31a64b3a94..62d543d0a0f 100644
--- a/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result
+++ b/mysql-test/suite/sys_vars/r/max_allowed_packet_func.result
@@ -14,7 +14,7 @@ SET @@session.max_allowed_packet = 1024;
 ERROR HY000: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.max_allowed_packet;
 @@session.max_allowed_packet
-4194304
+16777216
 SET @@session.net_buffer_length = 1024;
 ERROR HY000: SESSION variable 'net_buffer_length' is read-only. Use SET GLOBAL to assign the value
 SELECT @@session.net_buffer_length;
diff --git a/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result b/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result
index 3fc0f563298..365b3f24c28 100644
--- a/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result
+++ b/mysql-test/suite/sys_vars/r/myisam_recover_options_basic.result
@@ -1,20 +1,20 @@
 select @@global.myisam_recover_options;
 @@global.myisam_recover_options
-DEFAULT
+BACKUP,QUICK
 select @@session.myisam_recover_options;
 ERROR HY000: Variable 'myisam_recover_options' is a GLOBAL variable
 show global variables like 'myisam_recover_options';
 Variable_name	Value
-myisam_recover_options	DEFAULT
+myisam_recover_options	BACKUP,QUICK
 show session variables like 'myisam_recover_options';
 Variable_name	Value
-myisam_recover_options	DEFAULT
+myisam_recover_options	BACKUP,QUICK
 select * from information_schema.global_variables where variable_name='myisam_recover_options';
 VARIABLE_NAME	VARIABLE_VALUE
-MYISAM_RECOVER_OPTIONS	DEFAULT
+MYISAM_RECOVER_OPTIONS	BACKUP,QUICK
 select * from information_schema.session_variables where variable_name='myisam_recover_options';
 VARIABLE_NAME	VARIABLE_VALUE
-MYISAM_RECOVER_OPTIONS	DEFAULT
+MYISAM_RECOVER_OPTIONS	BACKUP,QUICK
 set global myisam_recover_options=1;
 ERROR HY000: Variable 'myisam_recover_options' is a read only variable
 set session myisam_recover_options=1;
diff --git a/mysql-test/suite/sys_vars/r/replicate_annotate_row_events_basic.result b/mysql-test/suite/sys_vars/r/replicate_annotate_row_events_basic.result
index 802c92268d6..08298a4f316 100644
--- a/mysql-test/suite/sys_vars/r/replicate_annotate_row_events_basic.result
+++ b/mysql-test/suite/sys_vars/r/replicate_annotate_row_events_basic.result
@@ -1,20 +1,20 @@
 select @@global.replicate_annotate_row_events;
 @@global.replicate_annotate_row_events
-0
+1
 select @@session.replicate_annotate_row_events;
 ERROR HY000: Variable 'replicate_annotate_row_events' is a GLOBAL variable
 show global variables like 'replicate_annotate_row_events';
 Variable_name	Value
-replicate_annotate_row_events	OFF
+replicate_annotate_row_events	ON
 show session variables like 'replicate_annotate_row_events';
 Variable_name	Value
-replicate_annotate_row_events	OFF
+replicate_annotate_row_events	ON
 select * from information_schema.global_variables where variable_name='replicate_annotate_row_events';
 VARIABLE_NAME	VARIABLE_VALUE
-REPLICATE_ANNOTATE_ROW_EVENTS	OFF
+REPLICATE_ANNOTATE_ROW_EVENTS	ON
 select * from information_schema.session_variables where variable_name='replicate_annotate_row_events';
 VARIABLE_NAME	VARIABLE_VALUE
-REPLICATE_ANNOTATE_ROW_EVENTS	OFF
+REPLICATE_ANNOTATE_ROW_EVENTS	ON
 set global replicate_annotate_row_events=1;
 ERROR HY000: Variable 'replicate_annotate_row_events' is a read only variable
 set session replicate_annotate_row_events=1;
diff --git a/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result b/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
index 1ef0b27b756..1b4d62c6c00 100644
--- a/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
+++ b/mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
@@ -7,12 +7,12 @@ SET @@global.slave_net_timeout = 500000;
 SET @@global.slave_net_timeout = DEFAULT;
 SELECT @@global.slave_net_timeout;
 @@global.slave_net_timeout
-3600
+60
 '#--------------------FN_DYNVARS_146_02-------------------------#'
 SET @@global.slave_net_timeout = DEFAULT;
 SELECT @@global.slave_net_timeout = 3600;
 @@global.slave_net_timeout = 3600
-1
+0
 '#--------------------FN_DYNVARS_146_03-------------------------#'
 SET @@global.slave_net_timeout = 0;
 Warnings:
diff --git a/mysql-test/suite/sys_vars/r/sync_binlog_basic.result b/mysql-test/suite/sys_vars/r/sync_binlog_basic.result
index bb0c8136391..2f070d05e52 100644
--- a/mysql-test/suite/sys_vars/r/sync_binlog_basic.result
+++ b/mysql-test/suite/sys_vars/r/sync_binlog_basic.result
@@ -1,18 +1,18 @@
 SET @start_value = @@global.sync_binlog;
 SELECT @start_value;
 @start_value
-0
+1
 '#--------------------FN_DYNVARS_168_01------------------------#'
 SET @@global.sync_binlog = 99;
 SET @@global.sync_binlog = DEFAULT;
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-0
+1
 '#---------------------FN_DYNVARS_168_02-------------------------#'
 SET @@global.sync_binlog = @start_value;
 SELECT @@global.sync_binlog = 0;
 @@global.sync_binlog = 0
-1
+0
 '#--------------------FN_DYNVARS_168_03------------------------#'
 SET @@global.sync_binlog = 0;
 SELECT @@global.sync_binlog;
@@ -111,4 +111,4 @@ ERROR 42S22: Unknown column 'sync_binlog' in 'field list'
 SET @@global.sync_binlog = @start_value;
 SELECT @@global.sync_binlog;
 @@global.sync_binlog
-0
+1
diff --git a/mysql-test/suite/sys_vars/r/sysvars_aria.result b/mysql-test/suite/sys_vars/r/sysvars_aria.result
index 461eef9ec47..6516260a05d 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_aria.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_aria.result
@@ -213,9 +213,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	ARIA_RECOVER_OPTIONS
 SESSION_VALUE	NULL
-GLOBAL_VALUE	NORMAL
+GLOBAL_VALUE	BACKUP,QUICK
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	NORMAL
+DEFAULT_VALUE	BACKUP,QUICK
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	SET
 VARIABLE_COMMENT	Specifies how corrupted tables should be automatically repaired
diff --git a/mysql-test/suite/sys_vars/r/sysvars_innodb.result b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
index 4b4e10141ab..46b80370912 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@@ -1520,9 +1520,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	INNODB_LOG_COMPRESSED_PAGES
 SESSION_VALUE	NULL
-GLOBAL_VALUE	OFF
+GLOBAL_VALUE	ON
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
+DEFAULT_VALUE	ON
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Enables/disables the logging of entire compressed page images. InnoDB logs the compressed pages to prevent corruption if the zlib compression algorithm changes. When turned OFF, InnoDB will assume that the zlib compression algorithm doesn't change.
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index d9ca81542cc..ae01d4b0b29 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -122,10 +122,10 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	BINLOG_ANNOTATE_ROW_EVENTS
-SESSION_VALUE	OFF
-GLOBAL_VALUE	OFF
+SESSION_VALUE	ON
+GLOBAL_VALUE	ON
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
+DEFAULT_VALUE	ON
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Tells the master to annotate RBR events with the statement that caused these events
@@ -206,10 +206,10 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	BINLOG_FORMAT
-SESSION_VALUE	STATEMENT
-GLOBAL_VALUE	STATEMENT
+SESSION_VALUE	MIXED
+GLOBAL_VALUE	MIXED
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	STATEMENT
+DEFAULT_VALUE	MIXED
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
 VARIABLE_COMMENT	What form of binary logging the master will use: either ROW for row-based binary logging, STATEMENT for statement-based binary logging, or MIXED. MIXED is statement-based binary logging except for those statements where only row-based is correct: those which involve user-defined functions (i.e. UDFs) or the UUID() function; for those, row-based binary logging is automatically used.
@@ -1004,13 +1004,13 @@ ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	GROUP_CONCAT_MAX_LEN
-SESSION_VALUE	1024
-GLOBAL_VALUE	1024
+SESSION_VALUE	1048576
+GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	1024
+DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	The maximum length of the result of function  GROUP_CONCAT()
+VARIABLE_COMMENT	The maximum length of the result of function GROUP_CONCAT()
 NUMERIC_MIN_VALUE	4
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	1
@@ -1592,10 +1592,10 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	LOCK_WAIT_TIMEOUT
-SESSION_VALUE	31536000
-GLOBAL_VALUE	31536000
+SESSION_VALUE	86400
+GLOBAL_VALUE	86400
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	31536000
+DEFAULT_VALUE	86400
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Timeout in seconds to wait for a lock before returning an error.
@@ -1705,9 +1705,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	LOG_SLOW_ADMIN_STATEMENTS
 SESSION_VALUE	NULL
-GLOBAL_VALUE	OFF
+GLOBAL_VALUE	ON
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
+DEFAULT_VALUE	ON
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements to the slow log if it is open.
@@ -1747,9 +1747,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	LOG_SLOW_SLAVE_STATEMENTS
 SESSION_VALUE	NULL
-GLOBAL_VALUE	OFF
+GLOBAL_VALUE	ON
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
+DEFAULT_VALUE	ON
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Log slow statements executed by slave thread to the slow log if it is open.
@@ -1774,10 +1774,10 @@ ENUM_VALUE_LIST	innodb,query_plan,explain
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	LOG_WARNINGS
-SESSION_VALUE	1
-GLOBAL_VALUE	1
+SESSION_VALUE	2
+GLOBAL_VALUE	2
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	1
+DEFAULT_VALUE	2
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity
@@ -1816,10 +1816,10 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	MAX_ALLOWED_PACKET
-SESSION_VALUE	4194304
-GLOBAL_VALUE	4194304
+SESSION_VALUE	16777216
+GLOBAL_VALUE	16777216
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	4194304
+DEFAULT_VALUE	16777216
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Max packet length to send to or receive from the server
@@ -1999,7 +1999,7 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MAX_LONG_DATA_SIZE
 SESSION_VALUE	NULL
-GLOBAL_VALUE	4194304
+GLOBAL_VALUE	16777216
 GLOBAL_VALUE_ORIGIN	AUTO
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	GLOBAL
@@ -2279,9 +2279,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MYISAM_RECOVER_OPTIONS
 SESSION_VALUE	NULL
-GLOBAL_VALUE	DEFAULT
+GLOBAL_VALUE	BACKUP,QUICK
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	DEFAULT
+DEFAULT_VALUE	BACKUP,QUICK
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	SET
 VARIABLE_COMMENT	Specifies how corrupted tables should be automatically repaired
@@ -3861,9 +3861,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	SYNC_BINLOG
 SESSION_VALUE	NULL
-GLOBAL_VALUE	0
+GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	0
+DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	Synchronously flush binary log to disk after every #th event. Use 0 (default) to disable synchronous flushing
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index fd5102d8a60..5ac6920d42c 100644
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -122,10 +122,10 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	BINLOG_ANNOTATE_ROW_EVENTS
-SESSION_VALUE	OFF
-GLOBAL_VALUE	OFF
+SESSION_VALUE	ON
+GLOBAL_VALUE	ON
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
+DEFAULT_VALUE	ON
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Tells the master to annotate RBR events with the statement that caused these events
@@ -206,10 +206,10 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	BINLOG_FORMAT
-SESSION_VALUE	STATEMENT
-GLOBAL_VALUE	STATEMENT
+SESSION_VALUE	MIXED
+GLOBAL_VALUE	MIXED
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	STATEMENT
+DEFAULT_VALUE	MIXED
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
 VARIABLE_COMMENT	What form of binary logging the master will use: either ROW for row-based binary logging, STATEMENT for statement-based binary logging, or MIXED. MIXED is statement-based binary logging except for those statements where only row-based is correct: those which involve user-defined functions (i.e. UDFs) or the UUID() function; for those, row-based binary logging is automatically used.
@@ -1032,13 +1032,13 @@ ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	GROUP_CONCAT_MAX_LEN
-SESSION_VALUE	1024
-GLOBAL_VALUE	1024
+SESSION_VALUE	1048576
+GLOBAL_VALUE	1048576
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	1024
+DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	The maximum length of the result of function  GROUP_CONCAT()
+VARIABLE_COMMENT	The maximum length of the result of function GROUP_CONCAT()
 NUMERIC_MIN_VALUE	4
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	1
@@ -1718,10 +1718,10 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	LOCK_WAIT_TIMEOUT
-SESSION_VALUE	31536000
-GLOBAL_VALUE	31536000
+SESSION_VALUE	86400
+GLOBAL_VALUE	86400
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	31536000
+DEFAULT_VALUE	86400
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Timeout in seconds to wait for a lock before returning an error.
@@ -1873,9 +1873,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	LOG_SLOW_ADMIN_STATEMENTS
 SESSION_VALUE	NULL
-GLOBAL_VALUE	OFF
+GLOBAL_VALUE	ON
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
+DEFAULT_VALUE	ON
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Log slow OPTIMIZE, ANALYZE, ALTER and other administrative statements to the slow log if it is open.
@@ -1915,9 +1915,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	LOG_SLOW_SLAVE_STATEMENTS
 SESSION_VALUE	NULL
-GLOBAL_VALUE	OFF
+GLOBAL_VALUE	ON
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
+DEFAULT_VALUE	ON
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Log slow statements executed by slave thread to the slow log if it is open.
@@ -1942,10 +1942,10 @@ ENUM_VALUE_LIST	innodb,query_plan,explain
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	LOG_WARNINGS
-SESSION_VALUE	1
-GLOBAL_VALUE	1
+SESSION_VALUE	2
+GLOBAL_VALUE	2
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	1
+DEFAULT_VALUE	2
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Log some not critical warnings to the general log file.Value can be between 0 and 11. Higher values mean more verbosity
@@ -1998,10 +1998,10 @@ ENUM_VALUE_LIST	OFF,ON
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	MAX_ALLOWED_PACKET
-SESSION_VALUE	4194304
-GLOBAL_VALUE	4194304
+SESSION_VALUE	16777216
+GLOBAL_VALUE	16777216
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	4194304
+DEFAULT_VALUE	16777216
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
 VARIABLE_COMMENT	Max packet length to send to or receive from the server
@@ -2181,7 +2181,7 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MAX_LONG_DATA_SIZE
 SESSION_VALUE	NULL
-GLOBAL_VALUE	4194304
+GLOBAL_VALUE	16777216
 GLOBAL_VALUE_ORIGIN	AUTO
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	GLOBAL
@@ -2475,9 +2475,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MYISAM_RECOVER_OPTIONS
 SESSION_VALUE	NULL
-GLOBAL_VALUE	DEFAULT
+GLOBAL_VALUE	BACKUP,QUICK
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	DEFAULT
+DEFAULT_VALUE	BACKUP,QUICK
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	SET
 VARIABLE_COMMENT	Specifies how corrupted tables should be automatically repaired
@@ -3637,9 +3637,9 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	REPLICATE_ANNOTATE_ROW_EVENTS
 SESSION_VALUE	NULL
-GLOBAL_VALUE	OFF
+GLOBAL_VALUE	ON
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	OFF
+DEFAULT_VALUE	ON
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
 VARIABLE_COMMENT	Tells the slave to write annotate rows events received from the master to its own binary log. Ignored if log_slave_updates is not set
@@ -4087,7 +4087,7 @@ VARIABLE_NAME	SLAVE_NET_TIMEOUT
 SESSION_VALUE	NULL
 GLOBAL_VALUE	120
 GLOBAL_VALUE_ORIGIN	CONFIG
-DEFAULT_VALUE	3600
+DEFAULT_VALUE	60
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	Number of seconds to wait for more data from any master/slave connection before aborting the read
@@ -4617,9 +4617,9 @@ READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	SYNC_BINLOG
 SESSION_VALUE	NULL
-GLOBAL_VALUE	0
+GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
-DEFAULT_VALUE	0
+DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
 VARIABLE_COMMENT	Synchronously flush binary log to disk after every #th event. Use 0 (default) to disable synchronous flushing