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
8375e668
Commit
8375e668
authored
Dec 08, 2006
by
df@kahlann.erinye.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG#24896 mysql_upgrade -p fix
parent
75c71141
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
client/mysql_upgrade.c
client/mysql_upgrade.c
+11
-1
No files found.
client/mysql_upgrade.c
View file @
8375e668
...
...
@@ -142,6 +142,7 @@ void set_extra_default(int id, const struct my_option *opt)
case
'f'
:
/* --force is ours */
case
'u'
:
/* --user passed on cmdline */
case
'T'
:
/* --debug-info is not accepted by mysqlcheck */
case
'p'
:
/* --password may change yet */
/* so, do nothing */
break
;
default:
...
...
@@ -173,7 +174,7 @@ void set_extra_default(int id, const struct my_option *opt)
d
->
id
=
id
;
d
->
name
=
opt
->
name
;
d
->
n_len
=
strlen
(
opt
->
name
);
if
(
opt
->
arg_type
!=
NO_ARG
)
if
(
opt
->
arg_type
!=
NO_ARG
&&
opt
->
value
)
switch
(
opt
->
var_type
&
GET_TYPE_MASK
)
{
case
GET_BOOL
:
if
(
*
((
int
*
)
opt
->
value
))
...
...
@@ -319,6 +320,15 @@ static int create_defaults_file(const char *path, const char *forced_path)
}
dynstr_set
(
&
buf
,
"
\n
[client]"
);
if
(
opt_password
)
{
if
(
dynstr_append_mem
(
&
buf
,
"
\n
password="
,
10
)
||
dynstr_append_mem
(
&
buf
,
opt_password
,
strlen
(
opt_password
)))
{
ret
=
1
;
goto
error
;
}
}
while
(
extra_defaults
)
{
int
len
;
...
...
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