bk commit into 5.1 tree (tnurnberg:1.2672) BUG#31177

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.1 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-10 08:12:41+01:00, tnurnberg@stripped +4 -0
  Bug #31177: Server variables can't be set to their current values
  
  fixes for SLES10

  mysql-test/r/change_user.result@stripped, 2007-12-10 08:12:40+01:00, tnurnberg@stripped +2
-2
    It's unsigned.

  mysys/my_getopt.c@stripped, 2007-12-10 08:12:40+01:00, tnurnberg@stripped +0 -2
    Failsafe no longer needed, we handle signedness correctly now.

  sql/set_var.cc@stripped, 2007-12-10 08:12:40+01:00, tnurnberg@stripped +1 -1
    ha_rows can be derived from all kinds of types, but
    they're all unsigned. Display it as such.

  tests/mysql_client_test.c@stripped, 2007-12-10 08:12:40+01:00, tnurnberg@stripped +11 -0
    cannot easily check this here due to types.
    check with Alik whether we need this on top
    of change_user.test.

diff -Nrup a/mysql-test/r/change_user.result b/mysql-test/r/change_user.result
--- a/mysql-test/r/change_user.result	2007-10-17 21:43:26 +02:00
+++ b/mysql-test/r/change_user.result	2007-12-10 08:12:40 +01:00
@@ -4,14 +4,14 @@ SELECT @@session.sql_big_selects;
 1
 SELECT @@global.max_join_size;
 @@global.max_join_size
--1
+18446744073709551615
 change_user
 SELECT @@session.sql_big_selects;
 @@session.sql_big_selects
 1
 SELECT @@global.max_join_size;
 @@global.max_join_size
--1
+18446744073709551615
 SET @@global.max_join_size = 10000;
 SET @@session.max_join_size = default;
 change_user
diff -Nrup a/mysys/my_getopt.c b/mysys/my_getopt.c
--- a/mysys/my_getopt.c	2007-12-06 01:29:18 +01:00
+++ b/mysys/my_getopt.c	2007-12-10 08:12:40 +01:00
@@ -892,8 +892,6 @@ ulonglong getopt_ull_limit_value(ulonglo
       num= ((ulonglong) ULONG_MAX);
       adjusted= TRUE;
     }
-#else
-    num= min(num, LONG_MAX);
 #endif
     break;
   default:
diff -Nrup a/sql/set_var.cc b/sql/set_var.cc
--- a/sql/set_var.cc	2007-12-06 01:46:47 +01:00
+++ b/sql/set_var.cc	2007-12-10 08:12:40 +01:00
@@ -1551,7 +1551,7 @@ Item *sys_var::item(THD *thd, enum_var_t
     pthread_mutex_lock(&LOCK_global_system_variables);
     value= *(ha_rows*) value_ptr(thd, var_type, base);
     pthread_mutex_unlock(&LOCK_global_system_variables);
-    return new Item_int((longlong) value);
+    return new Item_int((ulonglong) value);
   }
   case SHOW_MY_BOOL:
   {
diff -Nrup a/tests/mysql_client_test.c b/tests/mysql_client_test.c
--- a/tests/mysql_client_test.c	2007-11-30 19:30:22 +01:00
+++ b/tests/mysql_client_test.c	2007-12-10 08:12:40 +01:00
@@ -16990,6 +16990,12 @@ static void test_bug20023()
     Check that SQL_BIG_SELECTS will be the original one.
   ***********************************************************************/
 
+#if NOT_USED
+  /*
+    max_join_size is a ulong or better.
+    my_snprintf() only goes up to ul.
+  */
+
   /* Restore MAX_JOIN_SIZE. */
 
   my_snprintf(query_buffer,
@@ -16998,6 +17004,11 @@ static void test_bug20023()
            (int) max_join_size_orig);
 
   DIE_IF(mysql_query(&con, query_buffer));
+
+#else
+  DIE_IF(mysql_query(&con, "SET @@global.max_join_size = -1"));
+#endif
+
   DIE_IF(mysql_query(&con, "SET @@session.max_join_size = default"));
 
   /* Issue COM_CHANGE_USER. */