bk commit into 5.0 tree (tnurnberg:1.2558) BUG#31177

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.0 repository of tnurnberg. When tnurnberg 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@stripped, 2007-12-03 10:01:56+01:00, tnurnberg@stripped +2 -0
  Bug#31177: Server variables can't be set to their current values
  
  additional fixes for 64-bit

  mysql-test/t/variables.test@stripped, 2007-12-03 10:01:55+01:00, tnurnberg@stripped +1 -1
    replace 32-bit and 64-bit values

  mysys/my_getopt.c@stripped, 2007-12-03 10:01:55+01:00, tnurnberg@stripped +3 -1
    'mod' no longer used.
    on 64-bit, limit to (signed) (LONG)LONG_MAX to prevent badness
    in classes using longlong.

diff -Nrup a/mysql-test/t/variables.test b/mysql-test/t/variables.test
--- a/mysql-test/t/variables.test	2007-11-30 06:32:02 +01:00
+++ b/mysql-test/t/variables.test	2007-12-03 10:01:55 +01:00
@@ -126,7 +126,7 @@ set GLOBAL query_cache_size=100000;
 set GLOBAL myisam_max_sort_file_size=2000000;
 show global variables like 'myisam_max_sort_file_size';
 set GLOBAL myisam_max_sort_file_size=default;
---replace_result 2147482624 FILE_SIZE 2146435072 FILE_SIZE
+--replace_result 9223372036853727232 FILE_SIZE 2146435072 FILE_SIZE
 show variables like 'myisam_max_sort_file_size';
 
 set global net_retry_count=10, session net_retry_count=10;
diff -Nrup a/mysys/my_getopt.c b/mysys/my_getopt.c
--- a/mysys/my_getopt.c	2007-11-30 06:32:02 +01:00
+++ b/mysys/my_getopt.c	2007-12-03 10:01:55 +01:00
@@ -799,7 +799,7 @@ ulonglong getopt_ull_limit_value(ulonglo
                                  bool *fix)
 {
   bool adjusted= FALSE;
-  ulonglong old= num, mod;
+  ulonglong old= num;
   char buf1[255], buf2[255];
 
   if ((ulonglong) num > (ulonglong) optp->max_value &&
@@ -824,6 +824,8 @@ ulonglong getopt_ull_limit_value(ulonglo
       num= ((ulonglong) ULONG_MAX);
       adjusted= TRUE;
     }
+#else
+    num= min(num, LONG_MAX);
 #endif
     break;
   default: