summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2004-09-07 17:28:26 +0500
committerunknown <hf@deer.(none)>2004-09-07 17:28:26 +0500
commit95ae9c1442f9a33edaf6135ffde1fd4bcdce4107 (patch)
treea53384064bfa1efcf1ec56498dfe7726a0c548db /sql/sql_load.cc
parentfc10f15a277b4130d32b1d311d7c097955381824 (diff)
downloadmariadb-git-95ae9c1442f9a33edaf6135ffde1fd4bcdce4107.tar.gz
Code cleanup
sql/item_strfunc.cc: unpack_filename changed with fn_format's hint sql/sql_load.cc: unpack_filename changed with fn_format's hint
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 8ffd73e7ea1..e1f0b1f9501 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -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)))