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

1 files changed, 19 insertions, 15 deletions

diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 9ebd0f37444..d45a6e61c2f 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -33,6 +33,7 @@ The following options may be given as the first argument:
  --binlog-annotate-row-events 
  Tells the master to annotate RBR events with the
  statement that caused these events
+ (Defaults to on; use --skip-binlog-annotate-row-events to disable.)
  --binlog-cache-size=# 
  The size of the transactional cache for updates to
  transactional engines for the binary log. If you often
@@ -238,7 +239,7 @@ The following options may be given as the first argument:
  prefixes.
  (Defaults to on; use --skip-getopt-prefix-matching to disable.)
  --group-concat-max-len=# 
- The maximum length of the result of function 
+ The maximum length of the result of function
  GROUP_CONCAT()
  --gtid-domain-id=#  Used with global transaction ID to identify logically
  independent replication streams. When events can
@@ -379,6 +380,7 @@ The following options may be given as the first argument:
  --log-slow-admin-statements 
  Log slow OPTIMIZE, ANALYZE, ALTER and other
  administrative statements to the slow log if it is open.
+ (Defaults to on; use --skip-log-slow-admin-statements to disable.)
  --log-slow-filter=name 
  Log only certain types of queries. Any combination of: 
  admin, filesort, filesort_on_disk, full_join, full_scan, 
@@ -391,6 +393,7 @@ The following options may be given as the first argument:
  --log-slow-slave-statements 
  Log slow statements executed by slave thread to the slow
  log if it is open.
+ (Defaults to on; use --skip-log-slow-slave-statements to disable.)
  --log-slow-verbosity=name 
  Verbosity level for the slow log. Any combination of: 
  innodb, query_plan, explain
@@ -820,6 +823,7 @@ The following options may be given as the first argument:
  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
+ (Defaults to on; use --skip-replicate-annotate-row-events to disable.)
  --replicate-do-db=name 
  Tells the slave thread to restrict replication to the
  specified database. To specify more than one database,
@@ -1190,15 +1194,15 @@ automatic-sp-privileges TRUE
 back-log 80
 big-tables FALSE
 bind-address (No default value)
-binlog-annotate-row-events FALSE
+binlog-annotate-row-events TRUE
 binlog-cache-size 32768
 binlog-checksum CRC32
 binlog-commit-wait-count 0
 binlog-commit-wait-usec 100000
 binlog-direct-non-transactional-updates FALSE
-binlog-format STATEMENT
+binlog-format MIXED
 binlog-optimize-thread-scheduling TRUE
-binlog-row-event-max-size 1024
+binlog-row-event-max-size 8192
 binlog-row-image FULL
 binlog-stmt-cache-size 32768
 bulk-insert-buffer-size 8388608
@@ -1247,7 +1251,7 @@ ft-stopword-file (No default value)
 gdb FALSE
 general-log FALSE
 getopt-prefix-matching TRUE
-group-concat-max-len 1024
+group-concat-max-len 1048576
 gtid-domain-id 0
 gtid-ignore-duplicates FALSE
 gtid-strict-mode FALSE
@@ -1277,7 +1281,7 @@ lc-messages en_US
 lc-messages-dir MYSQL_SHAREDIR/
 lc-time-names en_US
 local-infile TRUE
-lock-wait-timeout 31536000
+lock-wait-timeout 86400
 log-bin (No default value)
 log-bin-compress FALSE
 log-bin-compress-min-len 256
@@ -1289,20 +1293,20 @@ log-output FILE
 log-queries-not-using-indexes FALSE
 log-short-format FALSE
 log-slave-updates FALSE
-log-slow-admin-statements FALSE
+log-slow-admin-statements TRUE
 log-slow-filter admin,filesort,filesort_on_disk,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
 log-slow-rate-limit 1
-log-slow-slave-statements FALSE
+log-slow-slave-statements TRUE
 log-slow-verbosity 
 log-tc tc.log
-log-warnings 1
+log-warnings 2
 long-query-time 10
 low-priority-updates FALSE
 lower-case-table-names 1
 master-info-file master.info
 master-retry-count 86400
 master-verify-checksum FALSE
-max-allowed-packet 4194304
+max-allowed-packet 16777216
 max-binlog-cache-size 18446744073709547520
 max-binlog-size 1073741824
 max-binlog-stmt-cache-size 18446744073709547520
@@ -1314,7 +1318,7 @@ max-error-count 64
 max-heap-table-size 16777216
 max-join-size 18446744073709551615
 max-length-for-sort-data 1024
-max-long-data-size 4194304
+max-long-data-size 16777216
 max-prepared-stmt-count 16382
 max-recursive-iterations 18446744073709551615
 max-relay-log-size 1073741824
@@ -1336,7 +1340,7 @@ myisam-block-size 1024
 myisam-data-pointer-size 6
 myisam-max-sort-file-size 9223372036853727232
 myisam-mmap-size 18446744073709551615
-myisam-recover-options DEFAULT
+myisam-recover-options BACKUP,QUICK
 myisam-repair-threads 1
 myisam-sort-buffer-size 134216704
 myisam-stats-method NULLS_UNEQUAL
@@ -1427,7 +1431,7 @@ relay-log-info-file relay-log.info
 relay-log-purge TRUE
 relay-log-recovery FALSE
 relay-log-space-limit 0
-replicate-annotate-row-events FALSE
+replicate-annotate-row-events TRUE
 replicate-events-marked-for-skip REPLICATE
 replicate-same-server-id FALSE
 report-host (No default value)
@@ -1455,7 +1459,7 @@ slave-ddl-exec-mode IDEMPOTENT
 slave-domain-parallel-threads 0
 slave-exec-mode STRICT
 slave-max-allowed-packet 1073741824
-slave-net-timeout 3600
+slave-net-timeout 60
 slave-parallel-max-queued 131072
 slave-parallel-mode conservative
 slave-parallel-threads 0
@@ -1474,7 +1478,7 @@ standard-compliant-cte TRUE
 stored-program-cache 256
 strict-password-validation TRUE
 symbolic-links FALSE
-sync-binlog 0
+sync-binlog 1
 sync-frm FALSE
 sync-master-info 10000
 sync-relay-log 10000