diff options
| author | unknown <paul@frost.snake.net> | 2005-06-07 10:09:47 -0500 |
|---|---|---|
| committer | unknown <paul@frost.snake.net> | 2005-06-07 10:09:47 -0500 |
| commit | 07ad3fc4bfdf3bd041b6b6d06f237451411f85ff (patch) | |
| tree | 29ad1f802e01c0f0031b1a24a21205656ab0f796 /sql | |
| parent | 37e3dc839c14bbfa12f03868ad917bb0147d3d48 (diff) | |
| parent | 3817ff00d0e1afad0da0decbcbfb672b7bf2dd97 (diff) | |
| download | mariadb-git-07ad3fc4bfdf3bd041b6b6d06f237451411f85ff.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index aeea9c1e88a..d2989bf9b1b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5374,7 +5374,7 @@ The minimum value for this variable is 4096.", (gptr*) &myisam_data_pointer_size, 0, GET_ULONG, REQUIRED_ARG, 6, 2, 8, 0, 1, 0}, {"myisam_max_extra_sort_file_size", OPT_MYISAM_MAX_EXTRA_SORT_FILE_SIZE, - "Depricated option", + "Deprecated option", (gptr*) &global_system_variables.myisam_max_extra_sort_file_size, (gptr*) &max_system_variables.myisam_max_extra_sort_file_size, 0, GET_ULL, REQUIRED_ARG, (ulonglong) MI_MAX_TEMP_LENGTH, |