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
ef56d39b
Commit
ef56d39b
authored
Mar 08, 2007
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074
parent
5948063b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
10 deletions
+5
-10
client/mysql_upgrade.c
client/mysql_upgrade.c
+5
-10
No files found.
client/mysql_upgrade.c
View file @
ef56d39b
...
@@ -173,7 +173,7 @@ void set_extra_default(int id, const struct my_option *opt)
...
@@ -173,7 +173,7 @@ void set_extra_default(int id, const struct my_option *opt)
}
}
d
=
(
extra_default_t
*
)
my_malloc
(
sizeof
(
extra_default_t
),
d
=
(
extra_default_t
*
)
my_malloc
(
sizeof
(
extra_default_t
),
MYF
(
MY_FAE
|
MY_ZEROFILL
));
MYF
(
MY_FAE
|
MY_ZEROFILL
));
d
->
id
=
id
;
d
->
id
=
id
;
d
->
name
=
opt
->
name
;
d
->
name
=
opt
->
name
;
d
->
n_len
=
strlen
(
opt
->
name
);
d
->
n_len
=
strlen
(
opt
->
name
);
...
@@ -366,7 +366,7 @@ static int create_defaults_file(const char *path, const char *forced_path)
...
@@ -366,7 +366,7 @@ static int create_defaults_file(const char *path, const char *forced_path)
goto
error
;
goto
error
;
}
}
DBUG_PRINT
(
"info"
,
(
"%s"
,
buf
.
str
));
DBUG_PRINT
(
"info"
,
(
"%s"
,
buf
.
str
));
my_free
((
gptr
)
d
,
MYF
(
0
));
my_free
((
gptr
)
d
,
MYF
(
0
));
list_pop
(
extra_defaults
);
/* pop off the head */
list_pop
(
extra_defaults
);
/* pop off the head */
}
}
if
(
my_write
(
defaults_file
,
buf
.
str
,
buf
.
length
,
MYF
(
MY_FNABP
|
MY_WME
)))
if
(
my_write
(
defaults_file
,
buf
.
str
,
buf
.
length
,
MYF
(
MY_FNABP
|
MY_WME
)))
...
@@ -463,9 +463,8 @@ int main(int argc, char **argv)
...
@@ -463,9 +463,8 @@ int main(int argc, char **argv)
char
*
forced_defaults_file
;
char
*
forced_defaults_file
;
char
*
forced_extra_defaults
;
char
*
forced_extra_defaults
;
char
*
local_defaults_group_suffix
;
char
*
local_defaults_group_suffix
;
int
no_defaults
;
char
path
[
FN_REFLEN
],
upgrade_defaults_path
[
FN_REFLEN
];
char
path
[
FN_REFLEN
],
upgrade_defaults_path
[
FN_REFLEN
];
DYNAMIC_STRING
cmdline
;
DYNAMIC_STRING
cmdline
;
MY_INIT
(
argv
[
0
]);
MY_INIT
(
argv
[
0
]);
...
@@ -587,9 +586,7 @@ int main(int argc, char **argv)
...
@@ -587,9 +586,7 @@ int main(int argc, char **argv)
instruct mysqlcheck to only read options from that file
instruct mysqlcheck to only read options from that file
*/
*/
dynstr_append
(
&
cmdline
,
" "
);
dynstr_append
(
&
cmdline
,
" "
);
dynstr_append_os_quoted
(
&
cmdline
,
dynstr_append_os_quoted
(
&
cmdline
,
"--defaults-file="
,
(
no_defaults
?
"--defaults-file="
:
"--defaults-extra-file="
),
upgrade_defaults_path
,
NullS
);
upgrade_defaults_path
,
NullS
);
dynstr_append
(
&
cmdline
,
" "
);
dynstr_append
(
&
cmdline
,
" "
);
dynstr_append_os_quoted
(
&
cmdline
,
"--check-upgrade"
,
NullS
);
dynstr_append_os_quoted
(
&
cmdline
,
"--check-upgrade"
,
NullS
);
...
@@ -664,9 +661,7 @@ int main(int argc, char **argv)
...
@@ -664,9 +661,7 @@ int main(int argc, char **argv)
instruct mysql to only read options from that file
instruct mysql to only read options from that file
*/
*/
dynstr_append
(
&
cmdline
,
" "
);
dynstr_append
(
&
cmdline
,
" "
);
dynstr_append_os_quoted
(
&
cmdline
,
dynstr_append_os_quoted
(
&
cmdline
,
"--defaults-file="
,
(
no_defaults
?
"--defaults-file="
:
"--defaults-extra-file="
),
upgrade_defaults_path
,
NullS
);
upgrade_defaults_path
,
NullS
);
dynstr_append
(
&
cmdline
,
" "
);
dynstr_append
(
&
cmdline
,
" "
);
dynstr_append_os_quoted
(
&
cmdline
,
"--force"
,
NullS
);
dynstr_append_os_quoted
(
&
cmdline
,
"--force"
,
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