diff options
| author | unknown <hf@deer.(none)> | 2004-09-14 10:04:35 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-09-14 10:04:35 +0500 |
| commit | ded743366a9ffc4b43a160a9688ce204f197a123 (patch) | |
| tree | 680ecd15801b71ed4fcc541dbb70b72366817e99 /sql/sql_load.cc | |
| parent | f0e23df61a0b5fb4a41f8dd46605b5b5f9545b05 (diff) | |
| parent | c7431f4c262182e980911ed6acb5de05ec9698fa (diff) | |
| download | mariadb-git-ded743366a9ffc4b43a160a9688ce204f197a123.tar.gz | |
Merging
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 1ba96fa3663..78d89ef7aa9 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -179,17 +179,16 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, #ifdef DONT_ALLOW_FULL_LOAD_DATA_PATHS ex->file_name+=dirname_length(ex->file_name); #endif - if (!dirname_length(ex->file_name) && - strlen(ex->file_name)+strlen(mysql_real_data_home)+strlen(tdb)+3 < - FN_REFLEN) + if (!dirname_length(ex->file_name)) { - (void) sprintf(name,"%s%s/%s",mysql_real_data_home,tdb,ex->file_name); - unpack_filename(name,name); /* Convert to system format */ + strxnmov(name, FN_REFLEN, mysql_real_data_home, tdb, NullS); + (void) fn_format(name, ex->file_name, name, "", + MY_RELATIVE_PATH | MY_UNPACK_FILENAME); } else { - my_load_path(name, ex->file_name, mysql_real_data_home); - 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))) |