1 files changed, 14 insertions, 12 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index ad57cc6fe5e..cb1399d9c93 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
@@ -805,6 +806,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,
@@ -1161,13 +1163,13 @@ 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-image FULL
@@ -1218,12 +1220,12 @@ 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
 help TRUE
-histogram-size 0
+histogram-size 255
 histogram-type SINGLE_PREC_HB
 host-cache-size 279
 ignore-builtin-innodb FALSE
@@ -1265,13 +1267,13 @@ log-slow-slave-statements FALSE
 log-slow-verbosity 
 log-tc tc.log
 log-warnings 1
-long-query-time 10
+long-query-time 2
 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
@@ -1283,7 +1285,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-relay-log-size 1073741824
 max-seeks-for-key 18446744073709551615
@@ -1303,7 +1305,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,FORCE
 myisam-repair-threads 1
 myisam-sort-buffer-size 134216704
 myisam-stats-method NULLS_UNEQUAL
@@ -1393,7 +1395,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)
@@ -1421,7 +1423,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
@@ -1439,7 +1441,7 @@ stack-trace 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
@@ -1463,7 +1465,7 @@ transaction-isolation REPEATABLE-READ
 transaction-prealloc-size 4096
 transaction-read-only FALSE
 updatable-views-with-limit YES
-use-stat-tables NEVER
+use-stat-tables COMPLEMENTARY
 userstat FALSE
 verbose TRUE
 wait-timeout 28800