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

Merge on pull

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
This commit is contained in:
unknown
2004-09-09 07:26:28 +03:00
parent c92b534970 33efc9677d
commit e18b7ea959
758 changed files with 39936 additions and 18741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_load.cc
View File

@ -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)))