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

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

Browse Source 
additional fixes for 64-bit
This commit is contained in:
tnurnberg@mysql.com/white.intern.koehntopp.de
2007-12-03 10:01:56 +01:00
parent 31d4e58ad4
commit 658f66e36e
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/variables.test
View File

@ -126,7 +126,7 @@ set GLOBAL query_cache_size=100000;
set GLOBAL myisam_max_sort_file_size=2000000; set GLOBAL myisam_max_sort_file_size=2000000;
show global variables like 'myisam_max_sort_file_size'; show global variables like 'myisam_max_sort_file_size';
set GLOBAL myisam_max_sort_file_size=default; 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'; show variables like 'myisam_max_sort_file_size';
set global net_retry_count=10, session net_retry_count=10; set global net_retry_count=10, session net_retry_count=10;

4
mysys/my_getopt.c
View File

@ -799,7 +799,7 @@ ulonglong getopt_ull_limit_value(ulonglong num, const struct my_option *optp,
bool *fix) bool *fix)
{ {
bool adjusted= FALSE; bool adjusted= FALSE;
ulonglong old= num, mod; ulonglong old= num;
char buf1[255], buf2[255]; char buf1[255], buf2[255];
if ((ulonglong) num > (ulonglong) optp->max_value && if ((ulonglong) num > (ulonglong) optp->max_value &&
@ -824,6 +824,8 @@ 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: