summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnel Husakovic <anel@mariadb.org>2019-11-28 15:08:29 +0100
committerAnel Husakovic <anel@mariadb.org>2019-12-02 21:37:01 +0100
commite3d3bbf59829e93e83ab05d831e92a742ffd7e32 (patch)
treef4df0855b9b74e8423aadab2119ef82683a99ec7
parent3cb60ec2c305f0b0ab9c3680eb787f8dcd78e57b (diff)
downloadmariadb-git-e3d3bbf59829e93e83ab05d831e92a742ffd7e32.tar.gz
Using `variables` instead of `values` in mysqld --help documentation would be more accurate
-rw-r--r--mysql-test/r/mysqld--help.result2
-rw-r--r--scripts/mysql_install_db.sh2
-rw-r--r--sql/mysqld.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 825c7e786a3..bececa14d7a 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1107,5 +1107,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'.
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index fb1663d9d69..fe7375494fe 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -214,7 +214,7 @@ cannot_find_file()
echo "If you compiled from source, you need to either run 'make install' to"
echo "copy the software into the correct location ready for operation."
echo "If you don't want to do a full install, you can use the --srcdir"
- echo "option to only install the mysql database and privilege tables"
+ echo "option to only install the mysql database and privilege tables."
echo
echo "If you are using a binary release, you must either be at the top"
echo "level of the extracted archive, or pass the --basedir option"
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 96daeab867d..2aedec595c0 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7240,7 +7240,7 @@ because execution stopped before plugins were initialized.");
}
puts("\n\
-To see what values a running MySQL server is using, type\n\
+To see what variables a running MySQL server is using, type\n\
'mysqladmin variables' instead of 'mysqld --verbose --help'.");
}
DBUG_VOID_RETURN;