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 | 98c57c1a11c54d8f04371760ec7f2ea9c19184d6 (patch) | |
| tree | c60ef5d6fc2e44e1e7bdbe2bf977c7d64bddf2f9 /sql | |
| parent | a487f2f0cf5cdf3b7938babd49fe684e85f13f3f (diff) | |
| parent | c055edc631ad5e681e3b5fea6527d0608797ddab (diff) | |
| download | mariadb-git-98c57c1a11c54d8f04371760ec7f2ea9c19184d6.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')
| -rw-r--r-- | sql/item.h | 1 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sql/item.h b/sql/item.h index a17c2af2823..d3e920faa68 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1151,6 +1151,7 @@ class Item_uint :public Item_int public: Item_uint(const char *str_arg, uint length); Item_uint(uint32 i) :Item_int((ulonglong) i, 10) {} + Item_uint(ulong i) :Item_int((ulonglong) i, 10) {} Item_uint(const char *str_arg, longlong i, uint length); double val_real() { DBUG_ASSERT(fixed == 1); return ulonglong2double((ulonglong)value); } 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, diff --git a/sql/set_var.cc b/sql/set_var.cc index 09581aed217..5cdd4081614 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -1679,7 +1679,7 @@ Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base) pthread_mutex_lock(&LOCK_global_system_variables); value= *(uint*) value_ptr(thd, var_type, base); pthread_mutex_unlock(&LOCK_global_system_variables); - return new Item_uint((int32) value); + return new Item_uint((uint32) value); } case SHOW_LONG: { @@ -1687,7 +1687,7 @@ Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base) pthread_mutex_lock(&LOCK_global_system_variables); value= *(ulong*) value_ptr(thd, var_type, base); pthread_mutex_unlock(&LOCK_global_system_variables); - return new Item_uint((int32) value); + return new Item_uint(value); } case SHOW_LONGLONG: { |