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

Automerge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2010-08-25 01:44:50 +03:00
parent 99b79db5dc a826711789
commit 58a75bb18b
167 changed files with 1625 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/mysqld.cc
View File

@ -9380,6 +9380,8 @@ bool is_secure_file_path(char *path)
static int fix_paths(void)
{
char buff[FN_REFLEN],*pos;
DBUG_ENTER("fix_paths");
convert_dirname(mysql_home,mysql_home,NullS);
/* Resolve symlinks to allow 'mysql_home' to be a relative symlink */
my_realpath(mysql_home,mysql_home,MYF(0));
@ -9424,12 +9426,12 @@ static int fix_paths(void)
charsets_dir=mysql_charsets_dir;
if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))
return 1;
DBUG_RETURN(1);
#ifdef HAVE_REPLICATION
if (!slave_load_tmpdir)
{
if (!(slave_load_tmpdir = (char*) my_strdup(mysql_tmpdir, MYF(MY_FAE))))
return 1;
DBUG_RETURN(1);
}
#endif /* HAVE_REPLICATION */
/*
@ -9450,7 +9452,7 @@ static int fix_paths(void)
if (my_realpath(buff, opt_secure_file_priv, 0))
{
sql_print_warning("Failed to normalize the argument for --secure-file-priv.");
return 1;
DBUG_RETURN(1);
}
secure_file_real_path= (char *)my_malloc(FN_REFLEN, MYF(MY_FAE));
convert_dirname(secure_file_real_path, buff, NullS);
@ -9458,7 +9460,7 @@ static int fix_paths(void)
opt_secure_file_priv= secure_file_real_path;
}
}
return 0;
DBUG_RETURN(0);
}