bk commit into 5.0 tree (jimw:1.1975) 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.1975 05/06/21 17:09:44 jimw@stripped +3 -0
  Fix value returned from SELECT of unsigned long system
  variables. (Bug #10351)

  sql/set_var.cc
    1.121 05/06/21 17:09:40 jimw@stripped +1 -1
    Don't cast an unsigned long to an int32 -- long may be larger than
    an int32 (like on 64-bit boxes).

  mysql-test/t/variables.test
    1.42 05/06/21 17:09:40 jimw@stripped +10 -0
    Add new test

  mysql-test/r/variables.result
    1.66 05/06/21 17:09:40 jimw@stripped +12 -0
    Add new 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.65/mysql-test/r/variables.result	2005-06-02 05:13:34 -07:00
+++ 1.66/mysql-test/r/variables.result	2005-06-21 17:09:40 -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.41/mysql-test/t/variables.test	2005-06-02 05:13:34 -07:00
+++ 1.42/mysql-test/t/variables.test	2005-06-21 17:09:40 -07:00
@@ -402,3 +402,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.120/sql/set_var.cc	2005-06-19 23:33:54 -07:00
+++ 1.121/sql/set_var.cc	2005-06-21 17:09:40 -07:00
@@ -1691,7 +1691,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_int((ulonglong)value, 10);
   }
   case SHOW_LONGLONG:
   {