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

Merge build.mysql.com:/home/bk/mysql-4.0

Browse Source 
into build.mysql.com:/users/rburnett/mysql-4.0
This commit is contained in:
rburnett@build.mysql.com 2004-10-06 22:03:20 +02:00
commit 9954abef02
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysqlimport.c
View File

@ -246,10 +246,8 @@ static int write_to_table(char *filename, MYSQL *sock)
DBUG_ENTER("write_to_table"); DBUG_ENTER("write_to_table");
DBUG_PRINT("enter",("filename: %s",filename)); DBUG_PRINT("enter",("filename: %s",filename));
local_file= sock->unix_socket == 0 || opt_local_file;
fn_format(tablename, filename, "", "", 1 | 2); /* removes path & ext. */ fn_format(tablename, filename, "", "", 1 | 2); /* removes path & ext. */
if (local_file) if (! opt_local_file)
strmov(hard_path,filename); strmov(hard_path,filename);
else else
my_load_path(hard_path, filename, NULL); /* filename includes the path */ my_load_path(hard_path, filename, NULL); /* filename includes the path */
@ -268,7 +266,7 @@ static int write_to_table(char *filename, MYSQL *sock)
to_unix_path(hard_path); to_unix_path(hard_path);
if (verbose) if (verbose)
{ {
if (local_file) if (opt_local_file)
fprintf(stdout, "Loading data from LOCAL file: %s into %s\n", fprintf(stdout, "Loading data from LOCAL file: %s into %s\n",
hard_path, tablename); hard_path, tablename);
else else
@ -277,7 +275,7 @@ static int write_to_table(char *filename, MYSQL *sock)
} }
sprintf(sql_statement, "LOAD DATA %s %s INFILE '%s'", sprintf(sql_statement, "LOAD DATA %s %s INFILE '%s'",
opt_low_priority ? "LOW_PRIORITY" : "", opt_low_priority ? "LOW_PRIORITY" : "",
local_file ? "LOCAL" : "", hard_path); opt_local_file ? "LOCAL" : "", hard_path);
end= strend(sql_statement); end= strend(sql_statement);
if (replace) if (replace)
end= strmov(end, " REPLACE"); end= strmov(end, " REPLACE");