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
d3855ce6
Commit
d3855ce6
authored
Aug 14, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ndb - bug#21213
5.1-fix adopt to changes in node recovery
parent
3b050ed4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+3
-2
No files found.
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
View file @
d3855ce6
...
@@ -3831,6 +3831,7 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal)
...
@@ -3831,6 +3831,7 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal)
}
}
else
if
(
activeCreat
==
Fragrecord
::
AC_NR_COPY
)
else
if
(
activeCreat
==
Fragrecord
::
AC_NR_COPY
)
{
{
regTcPtr
->
totSendlenAi
=
regTcPtr
->
totReclenAi
;
handle_nr_copy
(
signal
,
tcConnectptr
);
handle_nr_copy
(
signal
,
tcConnectptr
);
}
}
else
else
...
@@ -3845,7 +3846,8 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal)
...
@@ -3845,7 +3846,8 @@ void Dblqh::prepareContinueAfterBlockedLab(Signal* signal)
signal
->
theData
[
0
]
=
regTcPtr
->
tupConnectrec
;
signal
->
theData
[
0
]
=
regTcPtr
->
tupConnectrec
;
EXECUTE_DIRECT
(
DBTUP
,
GSN_TUP_ABORTREQ
,
signal
,
1
);
EXECUTE_DIRECT
(
DBTUP
,
GSN_TUP_ABORTREQ
,
signal
,
1
);
jamEntry
();
jamEntry
();
regTcPtr
->
totSendlenAi
=
regTcPtr
->
totReclenAi
;
packLqhkeyreqLab
(
signal
);
packLqhkeyreqLab
(
signal
);
}
}
}
}
...
@@ -7180,7 +7182,6 @@ void Dblqh::execACC_ABORTCONF(Signal* signal)
...
@@ -7180,7 +7182,6 @@ void Dblqh::execACC_ABORTCONF(Signal* signal)
signal
->
theData
[
0
]
=
regTcPtr
->
tupConnectrec
;
signal
->
theData
[
0
]
=
regTcPtr
->
tupConnectrec
;
EXECUTE_DIRECT
(
DBTUP
,
GSN_TUP_ABORTREQ
,
signal
,
1
);
EXECUTE_DIRECT
(
DBTUP
,
GSN_TUP_ABORTREQ
,
signal
,
1
);
regTcPtr
->
totSendlenAi
=
regTcPtr
->
totReclenAi
;
continueAbortLab
(
signal
);
continueAbortLab
(
signal
);
return
;
return
;
}
//Dblqh::execACC_ABORTCONF()
}
//Dblqh::execACC_ABORTCONF()
...
...
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