diff options
| author | unknown <jimw@mysql.com> | 2005-07-28 10:40:44 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-07-28 10:40:44 -0700 |
| commit | f2bee8f2b19e90d1bfdb8341adb6483874697924 (patch) | |
| tree | c60ef5d6fc2e44e1e7bdbe2bf977c7d64bddf2f9 /sql/mysqld.cc | |
| parent | f10d7d41bf38e5ef3fe466eade7b4e3a49257df8 (diff) | |
| parent | 008d8f07fee7bf6b2f359397541c7f66a4e0b35f (diff) | |
| download | mariadb-git-f2bee8f2b19e90d1bfdb8341adb6483874697924.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-10351
into mysql.com:/home/jimw/my/mysql-5.0-clean
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -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 74b0e024905..26d8cc07235 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5371,7 +5371,7 @@ The minimum value for this variable is 4096.", "Limit assumed max number of seeks when looking up rows based on a key", (gptr*) &global_system_variables.max_seeks_for_key, (gptr*) &max_system_variables.max_seeks_for_key, 0, GET_ULONG, - REQUIRED_ARG, ~0L, 1, ~0L, 0, 1, 0 }, + REQUIRED_ARG, UINT_MAX32, 1, UINT_MAX32, 0, 1, 0 }, {"max_sort_length", OPT_MAX_SORT_LENGTH, "The number of bytes to use when sorting BLOB or TEXT values (only the first max_sort_length bytes of each value are used; the rest are ignored).", (gptr*) &global_system_variables.max_sort_length, |