diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:26:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:26:40 +0300 |
| commit | 9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (patch) | |
| tree | 1adb4d44b9b7e7cf20e63e3ebc95ba05f7dc47e9 /mysql-test/r/mysqld--help.result | |
| parent | 5b79303b40e31d77f616c2b797f58de41973e6a3 (diff) | |
| parent | c7bb33724826dab53831b74bc0cf7ec311eb13f0 (diff) | |
| download | mariadb-git-9c34a4124d67d9e3f70837eaeb11290f35e8f8d0.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
| -rw-r--r-- | mysql-test/r/mysqld--help.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 7b78eae185e..fdb4d8c280d 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -2,8 +2,10 @@ Windows bug: happens when a new line is exactly at the right offset. The following options may be given as the first argument: --print-defaults Print the program argument list and exit. --no-defaults Don't read default options from any option file. +The following specify which files/extra groups are read (specified before remaining options): --defaults-file=# Only read default options from the given file #. --defaults-extra-file=# Read this file after the global files are read. +--defaults-group-suffix=# Additionally read default groups with # appended as a suffix. --allow-suspicious-udfs Allows use of UDFs consisting of only one symbol xxx() |