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 /sql | |
| parent | d930422e9e84aa1bc265963225dd29295203e9d3 (diff) | |
| parent | e3d3bbf59829e93e83ab05d831e92a742ffd7e32 (diff) | |
| download | mariadb-git-117c8146de7ccfaf2331225d6fb264de71aa6779.tar.gz | |
Merge branch '5.5' into 10.1
Diffstat (limited to 'sql')
| -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 4a216c9eecd..9a6aa2676d7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -8651,8 +8651,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; } |