database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

Browse Source 
into  mysql.com:/misc/mysql/31177/51-31177
This commit is contained in:
tnurnberg@white.intern.koehntopp.de
2007-12-10 08:20:33 +01:00
parent 8091abbf90 2959cc58cf
commit d3889cac7c
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/change_user.result
View File

@ -4,14 +4,14 @@ SELECT @@session.sql_big_selects;
1 1
SELECT @@global.max_join_size; SELECT @@global.max_join_size;
@@global.max_join_size @@global.max_join_size
-1 18446744073709551615
change_user change_user
SELECT @@session.sql_big_selects; SELECT @@session.sql_big_selects;
@@session.sql_big_selects @@session.sql_big_selects
1 1
SELECT @@global.max_join_size; SELECT @@global.max_join_size;
@@global.max_join_size @@global.max_join_size
-1 18446744073709551615
SET @@global.max_join_size = 10000; SET @@global.max_join_size = 10000;
SET @@session.max_join_size = default; SET @@session.max_join_size = default;
change_user change_user

2
mysys/my_getopt.c
View File

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

2
sql/set_var.cc
View File

@ -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); pthread_mutex_lock(&LOCK_global_system_variables);
value= *(ha_rows*) value_ptr(thd, var_type, base); value= *(ha_rows*) value_ptr(thd, var_type, base);
pthread_mutex_unlock(&LOCK_global_system_variables); pthread_mutex_unlock(&LOCK_global_system_variables);
return new Item_int((longlong) value); return new Item_int((ulonglong) value);
} }
case SHOW_MY_BOOL: case SHOW_MY_BOOL:
{ {

11
tests/mysql_client_test.c
View File

@ -17001,6 +17001,12 @@ static void test_bug20023()
Check that SQL_BIG_SELECTS will be the original one. 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. */ /* Restore MAX_JOIN_SIZE. */
my_snprintf(query_buffer, my_snprintf(query_buffer,
@ -17009,6 +17015,11 @@ static void test_bug20023()
(int) max_join_size_orig); (int) max_join_size_orig);
DIE_IF(mysql_query(&con, query_buffer)); 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")); DIE_IF(mysql_query(&con, "SET @@session.max_join_size = default"));
/* Issue COM_CHANGE_USER. */ /* Issue COM_CHANGE_USER. */