Bug #31177: Server variables can't be set to their current values

fixes for SLES10

Author: tnurnberg@mysql.com/white.intern.koehntopp.de

mysql-test/r/change_user.result

@@ -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

mysys/my_getopt.c

@@ -892,8 +892,6 @@ ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
       num= ((ulonglong) ULONG_MAX);
       adjusted= TRUE;
     }
-#else
-    num= min(num, LONG_MAX);
 #endif
     break;
   default:

sql/set_var.cc

@@ -1551,7 +1551,7 @@ Item *sys_var::item(THD *thd, enum_var_type var_type, LEX_STRING *base)
     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:
   {

tests/mysql_client_test.c

@@ -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. */