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
6e4a0ec0
Commit
6e4a0ec0
authored
Oct 25, 2006
by
jonas@perch.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
parents
64c414a0
470e4daa
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
6 deletions
+17
-6
ndb/src/common/debugger/EventLogger.cpp
ndb/src/common/debugger/EventLogger.cpp
+2
-2
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
+1
-0
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+1
-1
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+2
-1
ndb/src/ndbapi/NdbTransaction.cpp
ndb/src/ndbapi/NdbTransaction.cpp
+8
-1
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+3
-1
No files found.
ndb/src/common/debugger/EventLogger.cpp
View file @
6e4a0ec0
...
...
@@ -647,8 +647,8 @@ 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)"
,
(
block
==
DBACC
?
"Index"
:
(
block
==
DBTUP
?
"Data"
:
"<unknown>"
)),
...
...
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
View file @
6e4a0ec0
...
...
@@ -53,6 +53,7 @@ void Dbacc::initData()
tabrec
=
0
;
undopage
=
0
;
cnoOfAllocatedPages
=
cpagesize
=
0
;
// Records with constant sizes
}
//Dbacc::initData()
...
...
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
View file @
6e4a0ec0
...
...
@@ -177,7 +177,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
;
...
...
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
View file @
6e4a0ec0
...
...
@@ -142,6 +142,7 @@ Dbtup::Dbtup(const class Configuration & conf)
tablerec
=
0
;
tableDescriptor
=
0
;
undoPage
=
0
;
cnoOfPage
=
cnoOfAllocatedPages
=
0
;
}
//Dbtup::Dbtup()
Dbtup
::~
Dbtup
()
...
...
@@ -526,7 +527,7 @@ void Dbtup::execCONTINUEB(Signal* signal)
case
ZREPORT_MEMORY_USAGE
:{
ljam
();
static
int
c_currentMemUsed
=
0
;
int
now
=
(
cnoOfAllocatedPages
*
100
)
/
cnoOfPage
;
int
now
=
cnoOfPage
?
(
cnoOfAllocatedPages
*
100
)
/
cnoOfPage
:
0
;
const
int
thresholds
[]
=
{
100
,
90
,
80
,
0
};
Uint32
i
=
0
;
...
...
ndb/src/ndbapi/NdbTransaction.cpp
View file @
6e4a0ec0
...
...
@@ -357,8 +357,15 @@ NdbTransaction::execute(ExecType aTypeOfExec,
ret
=
-
1
;
if
(
savedError
.
code
==
0
)
savedError
=
theError
;
/**
* If AO_IgnoreError, error codes arent always set on individual
* operations, making postExecute impossible
*/
if
(
abortOption
==
AO_IgnoreError
)
DBUG_RETURN
(
-
1
);
}
#ifdef ndb_api_crash_on_complex_blob_abort
assert
(
theFirstOpInList
==
NULL
&&
theLastOpInList
==
NULL
);
#else
...
...
sql/ha_ndbcluster.cc
View file @
6e4a0ec0
...
...
@@ -1605,7 +1605,9 @@ int ha_ndbcluster::peek_indexed_rows(const byte *record)
int
res
;
DBUG_ENTER
(
"peek_indexed_rows"
);
NdbOperation
::
LockMode
lm
=
NdbOperation
::
LM_Read
;
NdbOperation
::
LockMode
lm
=
(
NdbOperation
::
LockMode
)
get_ndb_lock_type
(
m_lock
.
type
);
first
=
NULL
;
if
(
table
->
s
->
primary_key
!=
MAX_KEY
)
{
...
...
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