summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help.result
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2016-11-03 14:48:51 +0100
committerKristian Nielsen <knielsen@knielsen-hq.org>2016-11-03 14:48:51 +0100
commitb002509b67860df9f0634709b5fb8a2ab98d130a (patch)
tree3c1fb6c45a3a2275efc18e003bae531e81b3395e /mysql-test/r/mysqld--help.result
parentd665e79c5b8582f44dc280e5e6df4a8ff4945623 (diff)
parent56a041cde657e5618c519a3c50e8075136d4a1ce (diff)
downloadmariadb-git-b002509b67860df9f0634709b5fb8a2ab98d130a.tar.gz
MDEV-11065: Compressed binary log. Merge code into current 10.2.
Conflicts: sql/share/errmsg-utf8.txt
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
-rw-r--r--mysql-test/r/mysqld--help.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 32d38cd41ef..203921ce08f 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -344,6 +344,10 @@ The following options may be given as the first argument:
We strongly recommend to use either --log-basename or
specify a filename to ensure that replication doesn't
stop if the real hostname of the computer changes.
+ --log-bin-compress Whether the binary log can be compressed
+ --log-bin-compress-min-len[=#]
+ Minimum length of sql statement(in statement mode) or
+ record(in row mode)that can be compressed.
--log-bin-index=name
File that holds the names for last binary log files.
--log-bin-trust-function-creators
@@ -1267,6 +1271,8 @@ lc-time-names en_US
local-infile TRUE
lock-wait-timeout 31536000
log-bin (No default value)
+log-bin-compress FALSE
+log-bin-compress-min-len 256
log-bin-index (No default value)
log-bin-trust-function-creators FALSE
log-error