diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-03 14:45:06 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-12-03 14:45:06 +0100 |
commit | f8b5e147da18d0baa7345aed0deec0fd40666d19 (patch) | |
tree | c0b0cbb9bc0f5afd6ca123604a67323bdc521099 /sql/mysqld.cc | |
parent | 543f22a2d0633e645fb49a360c55528d8cb008fb (diff) | |
parent | 117c8146de7ccfaf2331225d6fb264de71aa6779 (diff) | |
download | mariadb-git-f8b5e147da18d0baa7345aed0deec0fd40666d19.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 34e5704bcfe..58106add403 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8754,8 +8754,8 @@ static void usage(void) "\nbecause execution stopped before plugins were initialized."); } - puts("\nTo see what values a running MySQL server is using, type" - "\n'mysqladmin variables' instead of 'mysqld --verbose --help'."); + puts("\nTo see what variables a running MySQL server is using, type" + "\n'mysqladmin variables' instead of 'mysqld --verbose --help'."); } DBUG_VOID_RETURN; } |