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
e4947433
Commit
e4947433
authored
Mar 23, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
parents
1c0c25e7
5827a23b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+2
-4
No files found.
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
View file @
e4947433
...
...
@@ -11242,10 +11242,10 @@ void Dbacc::execACC_CHECK_SCAN(Signal* signal)
operationRecPtr
.
i
=
scanPtr
.
p
->
scanFirstQueuedOp
;
ptrCheckGuard
(
operationRecPtr
,
coprecsize
,
operationrec
);
takeOutReadyScanQueue
(
signal
);
fragrecptr
.
i
=
operationRecPtr
.
p
->
fragptr
;
ptrCheckGuard
(
fragrecptr
,
cfragmentsize
,
fragmentrec
);
if
(
operationRecPtr
.
p
->
elementIsDisappeared
==
ZTRUE
)
{
jam
();
fragrecptr
.
i
=
operationRecPtr
.
p
->
fragptr
;
ptrCheckGuard
(
fragrecptr
,
cfragmentsize
,
fragmentrec
);
if
(
fragrecptr
.
p
->
createLcp
==
ZTRUE
)
{
if
(
remainingUndoPages
()
<
ZMIN_UNDO_PAGES_AT_COMMIT
)
{
jam
();
...
...
@@ -11890,8 +11890,6 @@ void Dbacc::sendNextScanConf(Signal* signal)
return
;
}
//if
fragrecptr
.
i
=
operationRecPtr
.
p
->
fragptr
;
ptrCheckGuard
(
fragrecptr
,
cfragmentsize
,
fragmentrec
);
if
(
fragrecptr
.
p
->
keyLength
!=
0
)
{
jam
();
signal
->
theData
[
0
]
=
scanPtr
.
p
->
scanUserptr
;
...
...
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