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
ebe7fe14
Commit
ebe7fe14
authored
Nov 18, 2004
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug#6677 bug#6684
parent
6aab88c9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
9 deletions
+25
-9
ndb/src/mgmclient/CommandInterpreter.cpp
ndb/src/mgmclient/CommandInterpreter.cpp
+6
-1
ndb/tools/restore/main.cpp
ndb/tools/restore/main.cpp
+19
-8
No files found.
ndb/src/mgmclient/CommandInterpreter.cpp
View file @
ebe7fe14
...
...
@@ -1386,7 +1386,7 @@ void
CommandInterpreter
::
executeDumpState
(
int
processId
,
const
char
*
parameters
,
bool
all
)
{
if
(
parameters
==
0
||
strlen
(
parameters
)
==
0
){
if
(
emptyString
(
parameters
)
){
ndbout
<<
"Expected argument"
<<
endl
;
return
;
}
...
...
@@ -1806,6 +1806,10 @@ CommandInterpreter::executeEventReporting(int processId,
const
char
*
parameters
,
bool
all
)
{
if
(
emptyString
(
parameters
))
{
ndbout
<<
"Expected argument"
<<
endl
;
return
;
}
connect
();
BaseString
tmp
(
parameters
);
...
...
@@ -1906,6 +1910,7 @@ void
CommandInterpreter
::
executeAbortBackup
(
char
*
parameters
)
{
connect
();
strtok
(
parameters
,
" "
);
struct
ndb_mgm_reply
reply
;
char
*
id
=
strtok
(
NULL
,
"
\0
"
);
...
...
ndb/tools/restore/main.cpp
View file @
ebe7fe14
...
...
@@ -74,7 +74,7 @@ static struct my_option my_long_options[] =
"No of parallel transactions during restore of data."
"(parallelism can be 1 to 1024)"
,
(
gptr
*
)
&
ga_nParallelism
,
(
gptr
*
)
&
ga_nParallelism
,
0
,
GET_INT
,
REQUIRED_ARG
,
128
,
0
,
0
,
0
,
0
,
0
},
GET_INT
,
REQUIRED_ARG
,
128
,
1
,
1024
,
0
,
1
,
0
},
{
"print"
,
256
,
"Print data and log to stdout"
,
(
gptr
*
)
&
_print
,
(
gptr
*
)
&
_print
,
0
,
GET_BOOL
,
NO_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
...
...
@@ -120,6 +120,18 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case
'V'
:
print_version
();
exit
(
0
);
case
'n'
:
if
(
ga_nodeId
==
0
)
{
printf
(
"Error in --nodeid|-n setting, see --help
\n
"
);
exit
(
1
);
}
case
'b'
:
if
(
ga_backupId
==
0
)
{
printf
(
"Error in --backupid|-b setting, see --help
\n
"
);
exit
(
1
);
}
case
'?'
:
usage
();
exit
(
0
);
...
...
@@ -131,11 +143,8 @@ readArguments(int *pargc, char*** pargv)
{
const
char
*
load_default_groups
[]
=
{
"ndb_tools"
,
"ndb_restore"
,
0
};
load_defaults
(
"my"
,
load_default_groups
,
pargc
,
pargv
);
if
(
handle_options
(
pargc
,
pargv
,
my_long_options
,
get_one_option
)
||
ga_nodeId
==
0
||
ga_backupId
==
0
||
ga_nParallelism
<
1
||
ga_nParallelism
>
1024
)
{
if
(
handle_options
(
pargc
,
pargv
,
my_long_options
,
get_one_option
))
{
exit
(
1
);
}
...
...
@@ -343,7 +352,8 @@ main(int argc, char** argv)
if
(
res
<
0
)
{
err
<<
"Restore: An error occured while restoring data. Exiting... res="
<<
res
<<
endl
;
err
<<
"Restore: An error occured while restoring data. Exiting... "
<<
"res="
<<
res
<<
endl
;
return
-
1
;
}
...
...
@@ -369,7 +379,8 @@ main(int argc, char** argv)
}
if
(
res
<
0
)
{
err
<<
"Restore: An restoring the data log. Exiting... res="
<<
res
<<
endl
;
err
<<
"Restore: An restoring the data log. Exiting... res="
<<
res
<<
endl
;
return
-
1
;
}
logIter
.
validateFooter
();
//not implemented
...
...
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