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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
3728f43c
Commit
3728f43c
authored
Jun 23, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622
into mysql.com:/usr/local/mysql/tmp-5.0
parents
0f0e518e
0f3cc95b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
mysys/mf_dirname.c
mysys/mf_dirname.c
+3
-1
server-tools/instance-manager/instance_options.cc
server-tools/instance-manager/instance_options.cc
+7
-2
No files found.
mysys/mf_dirname.c
View file @
3728f43c
...
...
@@ -72,7 +72,9 @@ uint dirname_part(my_string to, const char *name)
SYNPOSIS
convert_dirname()
to Store result here
to Store result here. Must be at least of size
min(FN_REFLEN, strlen(from) + 1) to make room
for adding FN_LIBCHAR at the end.
from Original filename
from_end Pointer at end of filename (normally end \0)
...
...
server-tools/instance-manager/instance_options.cc
View file @
3728f43c
...
...
@@ -391,8 +391,13 @@ int Instance_options::complete_initialization(const char *default_path,
const
char
*
tmp
;
char
*
end
;
if
(
!
mysqld_path
&&
!
(
mysqld_path
=
strdup_root
(
&
alloc
,
default_path
)))
goto
err
;
if
(
!
mysqld_path
)
{
// Need one extra byte, as convert_dirname() adds a slash at the end.
if
(
!
(
mysqld_path
=
alloc_root
(
&
alloc
,
strlen
(
default_path
)
+
2
)))
goto
err
;
strcpy
((
char
*
)
mysqld_path
,
default_path
);
}
// it's safe to cast this to char* since this is a buffer we are allocating
end
=
convert_dirname
((
char
*
)
mysqld_path
,
mysqld_path
,
NullS
);
...
...
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