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
44310b14
Commit
44310b14
authored
Oct 13, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work
parents
a5408787
0d534b57
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
storage/ndb/src/common/debugger/EventLogger.cpp
storage/ndb/src/common/debugger/EventLogger.cpp
+2
-2
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
+1
-0
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+1
-1
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+2
-1
No files found.
storage/ndb/src/common/debugger/EventLogger.cpp
View file @
44310b14
...
...
@@ -683,7 +683,7 @@ void getTextMemoryUsage(QQQQ) {
const
int
used
=
theData
[
3
];
const
int
total
=
theData
[
4
];
const
int
block
=
theData
[
5
];
const
int
percent
=
(
used
*
100
)
/
total
;
const
int
percent
=
total
?
(
used
*
100
)
/
total
:
0
;
BaseString
::
snprintf
(
m_text
,
m_text_len
,
"%s usage %s %d%s(%d %dK pages of total %d)"
,
...
...
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
View file @
44310b14
...
...
@@ -42,6 +42,7 @@ void Dbacc::initData()
scanRec
=
0
;
tabrec
=
0
;
cnoOfAllocatedPages
=
cpagesize
=
0
;
// Records with constant sizes
}
//Dbacc::initData()
...
...
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
View file @
44310b14
...
...
@@ -113,7 +113,7 @@ void Dbacc::execCONTINUEB(Signal* signal)
case
ZREPORT_MEMORY_USAGE
:{
jam
();
static
int
c_currentMemUsed
=
0
;
int
now
=
(
cnoOfAllocatedPages
*
100
)
/
cpagesize
;
int
now
=
cpagesize
?
(
cnoOfAllocatedPages
*
100
)
/
cpagesize
:
0
;
const
int
thresholds
[]
=
{
99
,
90
,
80
,
0
};
Uint32
i
=
0
;
...
...
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
View file @
44310b14
...
...
@@ -169,7 +169,8 @@ void Dbtup::execCONTINUEB(Signal* signal)
case
ZREPORT_MEMORY_USAGE
:{
ljam
();
static
int
c_currentMemUsed
=
0
;
int
now
=
(
cnoOfAllocatedPages
*
100
)
/
c_page_pool
.
getSize
();
Uint32
sz
=
c_page_pool
.
getSize
();
int
now
=
sz
?
(
cnoOfAllocatedPages
*
100
)
/
sz
:
0
;
const
int
thresholds
[]
=
{
100
,
90
,
80
,
0
};
Uint32
i
=
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