summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysqld--help.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-12-04 17:46:28 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2019-12-04 17:46:28 +0100
commit008ee867a4cc80e079bd2a8b7f8c8543d80c31f1 (patch)
tree9a971dca67c9edeabeb655b2275aea4b76729333 /mysql-test/main/mysqld--help.result
parent670c9a3a182cfc3a75bc8ed847cadb2931aaaec4 (diff)
parentc9b9eb331570704d020fcc7c7894f19febe7f26d (diff)
downloadmariadb-git-008ee867a4cc80e079bd2a8b7f8c8543d80c31f1.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/mysqld--help.result')
-rw-r--r--mysql-test/main/mysqld--help.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 067348eeb45..6e4a109b1b6 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -1717,5 +1717,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'.