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
b0232826
Commit
b0232826
authored
18 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
parents
79e26c1f
9b0dcd41
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
storage/ndb/src/kernel/SimBlockList.cpp
storage/ndb/src/kernel/SimBlockList.cpp
+1
-2
storage/ndb/src/kernel/vm/SimulatedBlock.hpp
storage/ndb/src/kernel/vm/SimulatedBlock.hpp
+2
-0
No files found.
storage/ndb/src/kernel/SimBlockList.cpp
View file @
b0232826
...
...
@@ -78,8 +78,7 @@ SimBlockList::load(Configuration & conf){
Lgman
*
lg
=
0
;
Tsman
*
ts
=
0
;
Block_context
ctx
=
{
conf
,
*
(
Ndbd_mem_manager
*
)
0
};
Block_context
ctx
(
conf
,
*
(
Ndbd_mem_manager
*
)
0
);
SimulatedBlock
*
fs
=
0
;
{
...
...
This diff is collapsed.
Click to expand it.
storage/ndb/src/kernel/vm/SimulatedBlock.hpp
View file @
b0232826
...
...
@@ -77,6 +77,8 @@ typedef struct NewVar
struct
Block_context
{
Block_context
(
class
Configuration
&
cfg
,
class
Ndbd_mem_manager
&
mm
)
:
m_config
(
cfg
),
m_mm
(
mm
)
{}
class
Configuration
&
m_config
;
class
Ndbd_mem_manager
&
m_mm
;
};
...
...
This diff is collapsed.
Click to expand it.
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