summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-11-29 00:52:48 +0100
committerSergei Golubchik <serg@mariadb.org>2014-12-04 10:41:52 +0100
commite4f973930c6fd8d76c7ad4f2e0769336e555ef67 (patch)
tree455228939eb994df312ccee0ddeb8a879794879a /mysql-test/r/mysqld--help.result
parent6a2fbdf948af3e72be577daaac89e9a3ce69a682 (diff)
downloadmariadb-git-e4f973930c6fd8d76c7ad4f2e0769336e555ef67.tar.gz
MDEV-6999 Remove or deprecate unused variables
Diffstat (limited to 'mysql-test/r/mysqld--help.result')
-rw-r--r--mysql-test/r/mysqld--help.result6
1 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index 929813d303b..f263dfebad9 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -432,8 +432,7 @@ The following options may be given as the first argument:
max_statement_time seconds will be aborted. The argument
will be treated as a decimal value with microsecond
precision. A value of 0 (default) means no timeout
- --max-tmp-tables=# Maximum number of temporary tables a client can keep open
- at a time
+ --max-tmp-tables=# Unused, will be removed.
--max-user-connections=#
The maximum number of active connections for a single
user (0 = no limit)
@@ -858,8 +857,6 @@ The following options may be given as the first argument:
--rowid-merge-buff-size=#
The size of the buffers used [NOT] IN evaluation via
partial matching
- --rpl-recovery-rank=#
- Unused, will be removed
--safe-mode Skip some optimize stages (for testing). Deprecated.
--safe-user-create Don't allow new user creation by the user who has no
write privileges to the mysql.user table.
@@ -1322,7 +1319,6 @@ report-password (No default value)
report-port 0
report-user (No default value)
rowid-merge-buff-size 8388608
-rpl-recovery-rank 0
safe-user-create FALSE
secure-auth FALSE
secure-file-priv (No default value)