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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f1722c76
Commit
f1722c76
authored
Dec 01, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ndb -
fix merge error
parent
b20c6e69
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+1
-1
No files found.
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
View file @
f1722c76
...
@@ -367,7 +367,7 @@ void Cmvmi::execSTTOR(Signal* signal)
...
@@ -367,7 +367,7 @@ void Cmvmi::execSTTOR(Signal* signal)
if
(
theStartPhase
==
1
){
if
(
theStartPhase
==
1
){
jam
();
jam
();
if
(
theC
onfig
.
lockPagesInMainMemory
())
if
(
m_ctx
.
m_c
onfig
.
lockPagesInMainMemory
())
{
{
int
res
=
NdbMem_MemLockAll
();
int
res
=
NdbMem_MemLockAll
();
if
(
res
!=
0
){
if
(
res
!=
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