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
a460d5f2
Commit
a460d5f2
authored
Dec 08, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ndb - bug#21948
Fix bug in previous changeset...causing SR problems with disk
parent
ca3d0cf5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
3 deletions
+19
-3
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
+18
-3
storage/ndb/src/kernel/blocks/tsman.cpp
storage/ndb/src/kernel/blocks/tsman.cpp
+1
-0
No files found.
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
View file @
a460d5f2
...
...
@@ -176,8 +176,11 @@ Dbtup::dealloc_tuple(Signal* signal,
{
Local_key
disk
;
memcpy
(
&
disk
,
ptr
->
get_disk_ref_ptr
(
regTabPtr
),
sizeof
(
disk
));
PagePtr
tmpptr
;
tmpptr
.
i
=
m_pgman
.
m_ptr
.
i
;
tmpptr
.
p
=
reinterpret_cast
<
Page
*>
(
m_pgman
.
m_ptr
.
p
);
disk_page_free
(
signal
,
regTabPtr
,
regFragPtr
,
&
disk
,
*
(
PagePtr
*
)
&
m_pgman
.
m_
ptr
,
gci
);
&
disk
,
tmp
ptr
,
gci
);
}
if
(
!
(
bits
&
Tuple_header
::
LCP_SKIP
)
&&
lcpScan_ptr_i
!=
RNIL
)
...
...
@@ -356,7 +359,12 @@ Dbtup::disk_page_commit_callback(Signal* signal,
regOperPtr
.
p
->
m_commit_disk_callback_page
=
page_id
;
m_global_page_pool
.
getPtr
(
m_pgman
.
m_ptr
,
page_id
);
disk_page_set_dirty
(
*
(
Ptr
<
Page
>*
)
&
m_pgman
.
m_ptr
);
{
PagePtr
tmp
;
tmp
.
i
=
m_pgman
.
m_ptr
.
i
;
tmp
.
p
=
reinterpret_cast
<
Page
*>
(
m_pgman
.
m_ptr
.
p
);
disk_page_set_dirty
(
tmp
);
}
execTUP_COMMITREQ
(
signal
);
if
(
signal
->
theData
[
0
]
==
0
)
...
...
@@ -543,7 +551,14 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
break
;
}
get_page
=
true
;
disk_page_set_dirty
(
*
(
Ptr
<
Page
>*
)
&
m_pgman
.
m_ptr
);
{
PagePtr
tmpptr
;
tmpptr
.
i
=
m_pgman
.
m_ptr
.
i
;
tmpptr
.
p
=
reinterpret_cast
<
Page
*>
(
m_pgman
.
m_ptr
.
p
);
disk_page_set_dirty
(
tmpptr
);
}
regOperPtr
.
p
->
m_commit_disk_callback_page
=
res
;
regOperPtr
.
p
->
op_struct
.
m_load_diskpage_on_commit
=
0
;
}
...
...
storage/ndb/src/kernel/blocks/tsman.cpp
View file @
a460d5f2
...
...
@@ -1470,6 +1470,7 @@ Tsman::execALLOC_EXTENT_REQ(Signal* signal)
*/
ndbassert
(
extent
>=
per_page
);
preq
.
m_page
.
m_page_no
=
data_off
+
size
*
(
extent
-
/* zero */
per_page
);
preq
.
m_page
.
m_page_idx
=
extent
;
// extent_no
AllocExtentReq
*
rep
=
(
AllocExtentReq
*
)
signal
->
getDataPtr
();
rep
->
reply
.
errorCode
=
0
;
...
...
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