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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e26b2987
Commit
e26b2987
authored
Dec 18, 2007
by
tomas@whalegate.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
parents
e591fc7c
c629bd33
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
storage/ndb/src/mgmclient/CommandInterpreter.cpp
storage/ndb/src/mgmclient/CommandInterpreter.cpp
+11
-6
No files found.
storage/ndb/src/mgmclient/CommandInterpreter.cpp
View file @
e26b2987
...
@@ -859,10 +859,14 @@ event_thread_run(void* p)
...
@@ -859,10 +859,14 @@ event_thread_run(void* p)
{
{
do_event_thread
=
1
;
do_event_thread
=
1
;
do
{
do
{
if
(
ndb_logevent_get_next
(
log_handle
,
&
log_event
,
2000
)
<=
0
)
int
res
=
ndb_logevent_get_next
(
log_handle
,
&
log_event
,
2000
);
continue
;
if
(
res
>
0
)
{
Guard
g
(
printmutex
);
Guard
g
(
printmutex
);
printLogEvent
(
&
log_event
);
printLogEvent
(
&
log_event
);
}
else
if
(
res
<
0
)
break
;
}
while
(
do_event_thread
);
}
while
(
do_event_thread
);
ndb_mgm_destroy_logevent_handle
(
&
log_handle
);
ndb_mgm_destroy_logevent_handle
(
&
log_handle
);
}
}
...
@@ -2663,8 +2667,9 @@ CommandInterpreter::executeStartBackup(char* parameters, bool interactive)
...
@@ -2663,8 +2667,9 @@ CommandInterpreter::executeStartBackup(char* parameters, bool interactive)
{
{
int
count
=
0
;
int
count
=
0
;
int
retry
=
0
;
int
retry
=
0
;
int
res
;
do
{
do
{
if
(
ndb_logevent_get_next
(
log_handle
,
&
log_event
,
60000
)
>
0
)
if
(
(
res
=
ndb_logevent_get_next
(
log_handle
,
&
log_event
,
60000
)
)
>
0
)
{
{
int
print
=
0
;
int
print
=
0
;
switch
(
log_event
.
type
)
{
switch
(
log_event
.
type
)
{
...
@@ -2694,7 +2699,7 @@ CommandInterpreter::executeStartBackup(char* parameters, bool interactive)
...
@@ -2694,7 +2699,7 @@ CommandInterpreter::executeStartBackup(char* parameters, bool interactive)
{
{
retry
++
;
retry
++
;
}
}
}
while
(
count
<
2
&&
retry
<
3
);
}
while
(
res
>=
0
&&
count
<
2
&&
retry
<
3
);
if
(
retry
>=
3
)
if
(
retry
>=
3
)
ndbout
<<
"get backup event failed for "
<<
retry
<<
" times"
<<
endl
;
ndbout
<<
"get backup event failed for "
<<
retry
<<
" times"
<<
endl
;
...
...
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