summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <gbichot@production.mysql.com>2007-07-25 22:29:53 +0200
committerunknown <gbichot@production.mysql.com>2007-07-25 22:29:53 +0200
commit3190cf37fde4df6605a733fe18cc5d55c6653c89 (patch)
treef21d4847b73de8a248191564f3cad3b4e4e7a47a /sql/mysqld.cc
parentc2f41696e645a89669db3ad382ee84c8e66dcc9d (diff)
downloadmariadb-git-3190cf37fde4df6605a733fe18cc5d55c6653c89.tar.gz
tmp_table_size is not about user-created temporary tables, only
internal ones (like those of GROUP BY): fixing the --help text. sql/mysqld.cc: tmp_table_size is not about user-created temporary tables, only internal ones (like those of GROUP BY)
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 61980fa1887..9eb3d157dcf 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6181,7 +6181,8 @@ The minimum value for this variable is 4096.",
(gptr*) &opt_date_time_formats[MYSQL_TIMESTAMP_TIME],
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"tmp_table_size", OPT_TMP_TABLE_SIZE,
- "If an in-memory temporary table exceeds this size, MySQL will automatically convert it to an on-disk MyISAM table.",
+ "If an internal in-memory temporary table exceeds this size, MySQL will"
+ " automatically convert it to an on-disk MyISAM table.",
(gptr*) &global_system_variables.tmp_table_size,
(gptr*) &max_system_variables.tmp_table_size, 0, GET_ULL,
REQUIRED_ARG, 32*1024*1024L, 1024, MAX_MEM_TABLE_SIZE, 0, 1, 0},