bk commit into 5.0 tree (gbichot:1.2480)

[guilhem]

Below is the list of changes that have just been committed into a local
5.0 repository of gbichot. When gbichot does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-25 22:29:53+02:00, gbichot@stripped +1 -0
  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@stripped, 2007-07-25 22:29:50+02:00, gbichot@stripped +2 -1
    tmp_table_size is not about user-created temporary tables, only
    internal ones (like those of GROUP BY)

diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2007-07-05 12:34:10 +02:00
+++ b/sql/mysqld.cc	2007-07-25 22:29:50 +02:00
@@ -6181,7 +6181,8 @@ The minimum value for this variable is 4
     (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},