diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-25 15:38:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-25 15:38:57 +0300 |
| commit | 1dea7f79779d13695876b84ebecbf41c13d845cb (patch) | |
| tree | fec8bf2607e69a9c6069001bb0de1f33fcae46ba /mysql-test/main/mysqld--help.result | |
| parent | 04de651725c3eeee8f216c55e2f8133e4547fadb (diff) | |
| parent | 1864a8ea93aa1d1a540c83526a25df2ad0330763 (diff) | |
| download | mariadb-git-1dea7f79779d13695876b84ebecbf41c13d845cb.tar.gz | |
Merge 10.3 into 10.4
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 45b1e4afe05..c008df32257 100644 --- a/mysql-test/main/mysqld--help.result +++ b/mysql-test/main/mysqld--help.result @@ -1519,7 +1519,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) |