bk commit into 5.0 tree (jimw:1.1895) BUG#10351

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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
  1.1895 05/07/22 16:18:34 jimw@stripped +5 -0
  Fix value returned from SELECT of unsigned long system
  variables. (Bug #10351)

  sql/set_var.cc
    1.126 05/07/22 16:18:28 jimw@stripped +2 -2
    Use correct Item_uint() constructors in sys_var::item()

  sql/mysqld.cc
    1.486 05/07/22 16:18:28 jimw@stripped +1 -1
    Fix default/max max_seeks_for_key to UINT_MAX32

  sql/item.h
    1.156 05/07/22 16:18:28 jimw@stripped +1 -0
    Add Item_uint(ulong) constructor

  mysql-test/t/variables.test
    1.43 05/07/22 16:18:28 jimw@stripped +10 -0
    Add regression test

  mysql-test/r/variables.result
    1.67 05/07/22 16:18:28 jimw@stripped +12 -0
    Update results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-10351

--- 1.155/sql/item.h	2005-07-19 09:06:42 -07:00
+++ 1.156/sql/item.h	2005-07-22 16:18:28 -07:00
@@ -1142,6 +1142,7 @@
 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); }

--- 1.485/sql/mysqld.cc	2005-07-19 16:33:19 -07:00
+++ 1.486/sql/mysqld.cc	2005-07-22 16:18:28 -07:00
@@ -5371,7 +5371,7 @@
     "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,

--- 1.66/mysql-test/r/variables.result	2005-07-03 04:17:45 -07:00
+++ 1.67/mysql-test/r/variables.result	2005-07-22 16:18:28 -07:00
@@ -525,3 +525,15 @@
 ERROR HY000: Variable 'warning_count' is a read only variable
 set @@global.error_count=1;
 ERROR HY000: Variable 'error_count' is a read only variable
+set @@max_heap_table_size= 4294967296;
+select @@max_heap_table_size;
+@@max_heap_table_size
[phone]
+set global max_heap_table_size= 4294967296;
+select @@max_heap_table_size;
+@@max_heap_table_size
[phone]
+set @@max_heap_table_size= 4294967296;
+select @@max_heap_table_size;
+@@max_heap_table_size
[phone]

--- 1.42/mysql-test/t/variables.test	2005-07-03 04:17:45 -07:00
+++ 1.43/mysql-test/t/variables.test	2005-07-22 16:18:28 -07:00
@@ -406,3 +406,13 @@
 set @@warning_count=1;
 --error 1238
 set @@global.error_count=1;
+
+#
+# Bug #10351: Setting max_heap_table_size to 4G fails
+#
+set @@max_heap_table_size= 4294967296;
+select @@max_heap_table_size;
+set global max_heap_table_size= 4294967296;
+select @@max_heap_table_size;
+set @@max_heap_table_size= 4294967296;
+select @@max_heap_table_size;

--- 1.125/sql/set_var.cc	2005-07-19 11:21:02 -07:00
+++ 1.126/sql/set_var.cc	2005-07-22 16:18:28 -07:00
@@ -1679,7 +1679,7 @@
     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 @@
     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:
   {