mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 23:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge 5.1->5.2

Browse source
This commit is contained in:
unknown 2010-02-01 08:14:12 +02:00
commit e5099a2c85
545 changed files with 14880 additions and 6217 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysys/my_file.c
View file

@ -51,7 +51,7 @@ static uint set_max_open_files(uint max_file_limit)
DBUG_PRINT("info", ("rlim_cur: %u rlim_max: %u",
(uint) rlimit.rlim_cur,
(uint) rlimit.rlim_max));
if (rlimit.rlim_cur == RLIM_INFINITY)
if ((ulonglong) rlimit.rlim_cur == (ulonglong) RLIM_INFINITY)
rlimit.rlim_cur = max_file_limit;
if (rlimit.rlim_cur >= max_file_limit)
DBUG_RETURN(rlimit.rlim_cur); /* purecov: inspected */

10
mysys/my_getopt.c
View file

@ -414,17 +414,11 @@ invalid value '%s'",
(optp->var_type & GET_TYPE_MASK) == GET_ENUM))
{
if (optend == disabled_my_option)
if ((optp->var_type & GET_TYPE_MASK) == GET_BOOL)
*((my_bool*) value)= (my_bool) 0;
else
*((ulong*) value)= (ulong) 0;
init_one_value(optp, value, 0);
else
{
if (!optend) /* No argument -> enable option */
if ((optp->var_type & GET_TYPE_MASK) == GET_BOOL)
*((my_bool*) value)= (my_bool) 1;
else
*((ulong*) value)= (ulong) 1;
init_one_value(optp, value, 1);
else
argument= optend;
}

10
mysys/my_sync.c
View file

@ -100,14 +100,15 @@ static const char cur_dir_name[]= {FN_CURLIB, 0};
RETURN
0 if ok, !=0 if error
*/
int my_sync_dir(const char *dir_name, myf my_flags)
int my_sync_dir(const char *dir_name __attribute__((unused)),
myf my_flags __attribute__((unused)))
{
#ifdef NEED_EXPLICIT_SYNC_DIR
DBUG_ENTER("my_sync_dir");
DBUG_PRINT("my",("Dir: '%s' my_flags: %d", dir_name, my_flags));
File dir_fd;
int res= 0;
const char *correct_dir_name;
DBUG_ENTER("my_sync_dir");
DBUG_PRINT("my",("Dir: '%s' my_flags: %d", dir_name, my_flags));
/* Sometimes the path does not contain an explicit directory */
correct_dir_name= (dir_name[0] == 0) ? cur_dir_name : dir_name;
/*
@ -141,7 +142,8 @@ int my_sync_dir(const char *dir_name, myf my_flags)
RETURN
0 if ok, !=0 if error
*/
int my_sync_dir_by_file(const char *file_name, myf my_flags)
int my_sync_dir_by_file(const char *file_name __attribute__((unused)),
myf my_flags __attribute__((unused)))
{
#ifdef NEED_EXPLICIT_SYNC_DIR
char dir_name[FN_REFLEN];

2
mysys/my_thr_init.c
View file

@ -317,7 +317,7 @@ my_bool my_thread_init(void)
/*
Skip initialization if the thread specific variable is already initialized
*/
if (THR_KEY_mysys.id)
if (THR_KEY_mysys.init)
goto end;
tmp= &THR_KEY_mysys;
#endif