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
3fdd5002
Commit
3fdd5002
authored
Aug 30, 2005
by
SergeyV@selena
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes bug #11815. Convert file path to UNIX format to build correct query
string while replicating LOAD DATA INFILE statement.
parent
c019e40f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
1 deletion
+9
-1
VC++Files/mysys/mysys.dsp
VC++Files/mysys/mysys.dsp
+4
-0
include/my_sys.h
include/my_sys.h
+1
-0
mysys/mf_format.c
mysys/mf_format.c
+2
-0
sql/log_event.cc
sql/log_event.cc
+2
-1
No files found.
VC++Files/mysys/mysys.dsp
View file @
3fdd5002
...
...
@@ -317,6 +317,10 @@ SOURCE=.\mf_tempfile.c
# End Source File
# Begin Source File
SOURCE=.\mf_unixpath.c
# End Source File
# Begin Source File
SOURCE=.\mf_wcomp.c
# End Source File
# Begin Source File
...
...
include/my_sys.h
View file @
3fdd5002
...
...
@@ -98,6 +98,7 @@ extern int NEAR my_errno; /* Last error in mysys */
#define MY_RETURN_REAL_PATH 32
/* return full path for file */
#define MY_SAFE_PATH 64
/* Return NULL if too long path */
#define MY_RELATIVE_PATH 128
/* name is relative to 'dir' */
#define MY_UNIX_PATH 256
/* convert path to UNIX format */
/* My seek flags */
#define MY_SEEK_SET 0
...
...
mysys/mf_format.c
View file @
3fdd5002
...
...
@@ -54,6 +54,8 @@ my_string fn_format(my_string to, const char *name, const char *dir,
pack_dirname
(
dev
,
dev
);
/* Put in ./.. and ~/.. */
if
(
flag
&
MY_UNPACK_FILENAME
)
(
void
)
unpack_dirname
(
dev
,
dev
);
/* Replace ~/.. with dir */
if
(
flag
&
MY_UNIX_PATH
)
to_unix_path
(
dev
);
/* Fix to MySQL representation */
if
((
pos
=
(
char
*
)
strchr
(
name
,
FN_EXTCHAR
))
!=
NullS
)
{
if
((
flag
&
MY_REPLACE_EXT
)
==
0
)
/* If we should keep old ext */
...
...
sql/log_event.cc
View file @
3fdd5002
...
...
@@ -121,7 +121,8 @@ static char *pretty_print_str(char *packet, char *str, int len)
static
inline
char
*
slave_load_file_stem
(
char
*
buf
,
uint
file_id
,
int
event_server_id
)
{
fn_format
(
buf
,
"SQL_LOAD-"
,
slave_load_tmpdir
,
""
,
MY_UNPACK_FILENAME
);
fn_format
(
buf
,
"SQL_LOAD-"
,
slave_load_tmpdir
,
""
,
MY_UNPACK_FILENAME
|
MY_UNIX_PATH
);
buf
=
strend
(
buf
);
buf
=
int10_to_str
(
::
server_id
,
buf
,
10
);
*
buf
++
=
'-'
;
...
...
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