Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
9954abef
Commit
9954abef
authored
Oct 06, 2004
by
rburnett@build.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge build.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/rburnett/mysql-4.0
parents
97febc4d
b4ee4d35
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
client/mysqlimport.c
client/mysqlimport.c
+3
-5
No files found.
client/mysqlimport.c
View file @
9954abef
...
...
@@ -246,10 +246,8 @@ static int write_to_table(char *filename, MYSQL *sock)
DBUG_ENTER
(
"write_to_table"
);
DBUG_PRINT
(
"enter"
,(
"filename: %s"
,
filename
));
local_file
=
sock
->
unix_socket
==
0
||
opt_local_file
;
fn_format
(
tablename
,
filename
,
""
,
""
,
1
|
2
);
/* removes path & ext. */
if
(
local_file
)
if
(
!
opt_
local_file
)
strmov
(
hard_path
,
filename
);
else
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
);
if
(
verbose
)
{
if
(
local_file
)
if
(
opt_
local_file
)
fprintf
(
stdout
,
"Loading data from LOCAL file: %s into %s
\n
"
,
hard_path
,
tablename
);
else
...
...
@@ -277,7 +275,7 @@ static int write_to_table(char *filename, MYSQL *sock)
}
sprintf
(
sql_statement
,
"LOAD DATA %s %s INFILE '%s'"
,
opt_low_priority
?
"LOW_PRIORITY"
:
""
,
local_file
?
"LOCAL"
:
""
,
hard_path
);
opt_
local_file
?
"LOCAL"
:
""
,
hard_path
);
end
=
strend
(
sql_statement
);
if
(
replace
)
end
=
strmov
(
end
,
" REPLACE"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment