diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-24 09:38:49 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-24 09:38:49 +0300 |
commit | 1864a8ea93aa1d1a540c83526a25df2ad0330763 (patch) | |
tree | f6d1ae8e9e696ea8537a395d061f697e5bccd4aa /mysql-test/main/mysqld--help.result | |
parent | b01a9fd817d9d8e5941008d6981338eaa7369c83 (diff) | |
parent | 5c75ba9cadc7877e91d6b712f157ff5623c09c60 (diff) | |
download | mariadb-git-1864a8ea93aa1d1a540c83526a25df2ad0330763.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
-rw-r--r-- | mysql-test/main/mysqld--help.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result index 54389a78f73..32b57435ec3 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1468,7 +1468,7 @@ lc-messages-dir MYSQL_SHAREDIR/ lc-time-names en_US local-infile TRUE lock-wait-timeout 86400 -log-bin (No default value) +log-bin foo log-bin-compress FALSE log-bin-compress-min-len 256 log-bin-index (No default value) |