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

Addition to the fix for #4815

Browse Source
This commit is contained in:
hf@deer.(none)
2004-09-02 11:10:26 +05:00
parent 8459cd358b
commit 5a817ea665
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_class.cc
View File

@ -854,21 +854,13 @@ static File create_file(THD *thd, char *path, sql_exchange *exchange,
{
File file;
uint option= MY_UNPACK_FILENAME;
char buff[FN_REFLEN];
#ifdef DONT_ALLOW_FULL_LOAD_DATA_PATHS
option|= MY_REPLACE_DIR; // Force use of db directory
#endif
char *cnt= strmake(buff, mysql_real_data_home, FN_REFLEN);
*cnt= FN_LIBCHAR;
cnt++;
cnt= strmake(cnt, thd->db ? thd->db : "", FN_REFLEN - (cnt-buff));
*cnt= FN_LIBCHAR;
cnt++;
*cnt= 0;
(void) fn_format(path, exchange->file_name, buff, "", option);
strxnmov(path, FN_REFLEN, mysql_real_data_home, thd->db ? thd->db : "");
(void) fn_format(path, exchange->file_name, path, "", option);
if (!access(path, F_OK))
{
my_error(ER_FILE_EXISTS_ERROR, MYF(0), exchange->file_name);