diff options
| author | Galina Shalygina <galashalygina@gmail.com> | 2016-05-25 00:29:13 +0300 |
|---|---|---|
| committer | Galina Shalygina <galashalygina@gmail.com> | 2016-05-25 00:29:13 +0300 |
| commit | c7c2f8d4a0dedd52795b7f8a6971c35ea46cc016 (patch) | |
| tree | cd55069d2bd3debaf86c472f2e34fa9f0052a2ab /mysql-test/r/mysqld--help.result | |
| parent | 93845e1718e4460e829a3e942bf5202e6a733db2 (diff) | |
| parent | 804b00e878dd14b0e50a646ac134c4a52259d41a (diff) | |
| download | mariadb-git-c7c2f8d4a0dedd52795b7f8a6971c35ea46cc016.tar.gz | |
Merge branch '10.2' of github.com:MariaDB/server into 10.2
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index a35693eb93e..cc432652db8 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1143,7 +1143,7 @@ big-tables FALSE bind-address (No default value) binlog-annotate-row-events FALSE binlog-cache-size 32768 -binlog-checksum NONE +binlog-checksum CRC32 binlog-commit-wait-count 0 binlog-commit-wait-usec 100000 binlog-direct-non-transactional-updates FALSE |