diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-03 09:39:53 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-03 09:39:53 +0100 |
| commit | 117c8146de7ccfaf2331225d6fb264de71aa6779 (patch) | |
| tree | 425776b42c117501cc7968473485babc8a1c59a5 /mysql-test/r/mysqld--help.result | |
| parent | d930422e9e84aa1bc265963225dd29295203e9d3 (diff) | |
| parent | e3d3bbf59829e93e83ab05d831e92a742ffd7e32 (diff) | |
| download | mariadb-git-117c8146de7ccfaf2331225d6fb264de71aa6779.tar.gz | |
Merge branch '5.5' 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, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result index 68aa84b6d18..c7fb52eeeb6 100644 --- a/mysql-test/r/mysqld--help.result +++ b/mysql-test/r/mysqld--help.result @@ -1465,5 +1465,5 @@ userstat FALSE verbose TRUE wait-timeout 28800 -To see what values a running MySQL server is using, type +To see what variables a running MySQL server is using, type 'mysqladmin variables' instead of 'mysqld --verbose --help'. |