1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source 
sql/item_strfunc.cc:
  unpack_filename changed with fn_format's hint
sql/sql_load.cc:
  unpack_filename changed with fn_format's hint
This commit is contained in:
unknown 2004-09-07 17:28:26 +05:00
parent 89ee639541
commit 9080b83818
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/item_strfunc.cc
View File

@ -2422,9 +2422,8 @@ String *Item_load_file::val_str(String *str)
)
goto err;
(void) fn_format(path, file_name->c_ptr(),
mysql_real_data_home, "", MY_RELATIVE_PATH);
unpack_filename(path, path); /* Convert to system format */
(void) fn_format(path, file_name->c_ptr(), mysql_real_data_home, "",
MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
if (!my_stat(path, &stat_info, MYF(MY_WME)))
goto err;

8
sql/sql_load.cc
View File

@ -182,13 +182,13 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
if (!dirname_length(ex->file_name))
{
strxnmov(name, FN_REFLEN, mysql_real_data_home, tdb, NullS);
(void) fn_format(name, ex->file_name, name, "", MY_RELATIVE_PATH);
unpack_filename(name,name);
(void) fn_format(name, ex->file_name, name, "",
MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
}
else
{
(void) fn_format(name, ex->file_name, mysql_real_data_home, "", MY_RELATIVE_PATH);
unpack_filename(name,name);
(void) fn_format(name, ex->file_name, mysql_real_data_home, "",
MY_RELATIVE_PATH | MY_UNPACK_FILENAME);
#if !defined(__WIN__) && !defined(OS2) && ! defined(__NETWARE__)
MY_STAT stat_info;
if (!my_stat(name,&stat_info,MYF(MY_WME)))