diff options
| author | unknown <monty@mysql.com> | 2004-09-09 07:26:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-09-09 07:26:28 +0300 |
| commit | e18b7ea95942cb8ab0b31d453929dde50dcf3756 (patch) | |
| tree | e2b882265e31ada44f3adec357920530f0c0ac31 /sql/sql_load.cc | |
| parent | c92b5349701ba68fa7ab97abf14933de8d6352fe (diff) | |
| parent | 33efc9677d6f6a68d3dba69f4c036856ac4af5fe (diff) | |
| download | mariadb-git-e18b7ea95942cb8ab0b31d453929dde50dcf3756.tar.gz | |
Merge on pull
BitKeeper/etc/logging_ok:
auto-union
include/my_sys.h:
Auto merged
mysql-test/r/func_in.result:
Auto merged
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index b629493a692..9b050c0863a 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -191,26 +191,16 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, ex->file_name+=dirname_length(ex->file_name); #endif if (!dirname_length(ex->file_name) && - strlen(ex->file_name)+strlen(mysql_data_home)+strlen(tdb)+3 < + strlen(ex->file_name)+strlen(mysql_real_data_home)+strlen(tdb)+3 < FN_REFLEN) { - (void) sprintf(name,"%s/%s/%s",mysql_data_home,tdb,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 */ } else { -#ifdef EMBEDDED_LIBRARY - char *chk_name= ex->file_name; - while ((*chk_name == ' ') || (*chk_name == 't')) - chk_name++; - if (*chk_name == FN_CURLIB) - { - sprintf(name, "%s%s", mysql_data_home, ex->file_name); - unpack_filename(name, name); - } - else -#endif /*EMBEDDED_LIBRARY*/ - unpack_filename(name,ex->file_name); + my_load_path(name, ex->file_name, mysql_real_data_home); + unpack_filename(name, name); #if !defined(__WIN__) && !defined(OS2) && ! defined(__NETWARE__) MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(MY_WME))) |