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
03f3b340
Commit
03f3b340
authored
Apr 16, 2003
by
hf@deer.mysql.r18.ru
Browse files
Options
Browse Files
Download
Plain Diff
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.clean
parents
6cf83136
73ae71a8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
mysys/default.c
mysys/default.c
+5
-3
No files found.
mysys/default.c
View file @
03f3b340
...
@@ -174,7 +174,8 @@ void load_defaults(const char *conf_file, const char **groups,
...
@@ -174,7 +174,8 @@ void load_defaults(const char *conf_file, const char **groups,
res
=
(
char
**
)
(
ptr
+
sizeof
(
alloc
));
res
=
(
char
**
)
(
ptr
+
sizeof
(
alloc
));
/* copy name + found arguments + command line arguments to new array */
/* copy name + found arguments + command line arguments to new array */
res
[
0
]
=
argv
[
0
][
0
];
res
[
0
]
=*
argc
?
argv
[
0
][
0
]
:
""
;
memcpy
((
gptr
)
(
res
+
1
),
args
.
buffer
,
args
.
elements
*
sizeof
(
char
*
));
memcpy
((
gptr
)
(
res
+
1
),
args
.
buffer
,
args
.
elements
*
sizeof
(
char
*
));
/* Skipp --defaults-file and --defaults-extra-file */
/* Skipp --defaults-file and --defaults-extra-file */
(
*
argc
)
-=
args_used
;
(
*
argc
)
-=
args_used
;
...
@@ -187,8 +188,9 @@ void load_defaults(const char *conf_file, const char **groups,
...
@@ -187,8 +188,9 @@ void load_defaults(const char *conf_file, const char **groups,
--*
argc
;
++*
argv
;
/* skipp argument */
--*
argc
;
++*
argv
;
/* skipp argument */
}
}
memcpy
((
gptr
)
(
res
+
1
+
args
.
elements
),
(
char
*
)
((
*
argv
)
+
1
),
if
(
*
argc
)
(
*
argc
-
1
)
*
sizeof
(
char
*
));
memcpy
((
gptr
)
(
res
+
1
+
args
.
elements
),
(
char
*
)
((
*
argv
)
+
1
),
(
*
argc
-
1
)
*
sizeof
(
char
*
));
res
[
args
.
elements
+
*
argc
]
=
0
;
/* last null */
res
[
args
.
elements
+
*
argc
]
=
0
;
/* last null */
(
*
argc
)
+=
args
.
elements
;
(
*
argc
)
+=
args
.
elements
;
...
...
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