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
e58f9240
Commit
e58f9240
authored
Oct 22, 2004
by
kent@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-sjis
parents
90a8caee
5037886d
Changes
22
Show whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
53 additions
and
31 deletions
+53
-31
configure.in
configure.in
+1
-0
ndb/include/kernel/LogLevel.hpp
ndb/include/kernel/LogLevel.hpp
+1
-0
ndb/include/kernel/signaldata/UpgradeStartup.hpp
ndb/include/kernel/signaldata/UpgradeStartup.hpp
+2
-0
ndb/include/mgmapi/mgmapi.h
ndb/include/mgmapi/mgmapi.h
+4
-1
ndb/include/ndb_global.h
ndb/include/ndb_global.h
+3
-0
ndb/include/ndb_types.h
ndb/include/ndb_types.h
+1
-1
ndb/include/ndbapi/Ndb.hpp
ndb/include/ndbapi/Ndb.hpp
+1
-0
ndb/include/ndbapi/NdbReceiver.hpp
ndb/include/ndbapi/NdbReceiver.hpp
+2
-0
ndb/include/ndbapi/NdbScanOperation.hpp
ndb/include/ndbapi/NdbScanOperation.hpp
+1
-0
ndb/src/common/debugger/EventLogger.cpp
ndb/src/common/debugger/EventLogger.cpp
+4
-1
ndb/src/common/util/ConfigValues.cpp
ndb/src/common/util/ConfigValues.cpp
+2
-5
ndb/src/kernel/blocks/backup/restore/Restore.hpp
ndb/src/kernel/blocks/backup/restore/Restore.hpp
+1
-1
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+5
-5
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+5
-0
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+8
-8
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+1
-1
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
+3
-2
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
+3
-0
ndb/src/mgmsrv/SignalQueue.cpp
ndb/src/mgmsrv/SignalQueue.cpp
+1
-2
ndb/src/ndbapi/NdbConnection.cpp
ndb/src/ndbapi/NdbConnection.cpp
+2
-2
ndb/src/ndbapi/NdbScanOperation.cpp
ndb/src/ndbapi/NdbScanOperation.cpp
+1
-1
ndb/tools/waiter.cpp
ndb/tools/waiter.cpp
+1
-1
No files found.
configure.in
View file @
e58f9240
...
@@ -1144,6 +1144,7 @@ dnl Is this the right match for DEC OSF on alpha?
...
@@ -1144,6 +1144,7 @@ dnl Is this the right match for DEC OSF on alpha?
# gethostbyname_r is deprecated and doesn't work ok on OSF1
# gethostbyname_r is deprecated and doesn't work ok on OSF1
CFLAGS
=
"
$CFLAGS
-DUNDEF_HAVE_GETHOSTBYNAME_R"
CFLAGS
=
"
$CFLAGS
-DUNDEF_HAVE_GETHOSTBYNAME_R"
CXXFLAGS
=
"
$CXXFLAGS
-DUNDEF_HAVE_GETHOSTBYNAME_R"
CXXFLAGS
=
"
$CXXFLAGS
-DUNDEF_HAVE_GETHOSTBYNAME_R"
ndb_cxxflags_fix
=
"
$ndb_cxxflags_fix
-I/usr/include.dtk"
;;
;;
*
netware
*
)
*
netware
*
)
# No need for curses library so set it to null
# No need for curses library so set it to null
...
...
ndb/include/kernel/LogLevel.hpp
View file @
e58f9240
...
@@ -47,6 +47,7 @@ public:
...
@@ -47,6 +47,7 @@ public:
LogLevel
&
operator
=
(
const
LogLevel
&
);
LogLevel
&
operator
=
(
const
LogLevel
&
);
enum
EventCategory
{
enum
EventCategory
{
llInvalid
=
-
1
,
llStartUp
=
CFG_LOGLEVEL_STARTUP
-
CFG_MIN_LOGLEVEL
,
llStartUp
=
CFG_LOGLEVEL_STARTUP
-
CFG_MIN_LOGLEVEL
,
llShutdown
=
CFG_LOGLEVEL_SHUTDOWN
-
CFG_MIN_LOGLEVEL
,
llShutdown
=
CFG_LOGLEVEL_SHUTDOWN
-
CFG_MIN_LOGLEVEL
,
llStatistic
=
CFG_LOGLEVEL_STATISTICS
-
CFG_MIN_LOGLEVEL
,
llStatistic
=
CFG_LOGLEVEL_STATISTICS
-
CFG_MIN_LOGLEVEL
,
...
...
ndb/include/kernel/signaldata/UpgradeStartup.hpp
View file @
e58f9240
#ifndef NDB_UPGRADE_STARTUP
#ifndef NDB_UPGRADE_STARTUP
#define NDB_UPGRADE_STARTUP
#define NDB_UPGRADE_STARTUP
class
Ndbcntr
;
struct
UpgradeStartup
{
struct
UpgradeStartup
{
static
void
installEXEC
(
SimulatedBlock
*
);
static
void
installEXEC
(
SimulatedBlock
*
);
...
...
ndb/include/mgmapi/mgmapi.h
View file @
e58f9240
...
@@ -271,7 +271,10 @@ extern "C" {
...
@@ -271,7 +271,10 @@ extern "C" {
* Log categories
* Log categories
*/
*/
enum
ndb_mgm_event_category
{
enum
ndb_mgm_event_category
{
NDB_MGM_ILLEGAL_EVENT_CATEGORY
=
-
1
,
/*< Invalid
/**
* Invalid
*/
NDB_MGM_ILLEGAL_EVENT_CATEGORY
=
-
1
,
/**
/**
* Events during all kinds of startups
* Events during all kinds of startups
*/
*/
...
...
ndb/include/ndb_global.h
View file @
e58f9240
...
@@ -13,6 +13,9 @@
...
@@ -13,6 +13,9 @@
#undef NDB_WIN32
#undef NDB_WIN32
#endif
#endif
#ifdef _AIX
#undef _H_STRINGS
#endif
#include <m_string.h>
#include <m_string.h>
#include <m_ctype.h>
#include <m_ctype.h>
#include <ndb_types.h>
#include <ndb_types.h>
...
...
ndb/include/ndb_types.h
View file @
e58f9240
...
@@ -33,7 +33,7 @@ typedef unsigned int UintR;
...
@@ -33,7 +33,7 @@ typedef unsigned int UintR;
#ifdef __SIZE_TYPE__
#ifdef __SIZE_TYPE__
typedef
__SIZE_TYPE__
UintPtr
;
typedef
__SIZE_TYPE__
UintPtr
;
#else
#else
#include <
my
_global.h>
#include <
ndb
_global.h>
#ifdef HAVE_STDINT_H
#ifdef HAVE_STDINT_H
#include <stdint.h>
#include <stdint.h>
#endif
#endif
...
...
ndb/include/ndbapi/Ndb.hpp
View file @
e58f9240
...
@@ -881,6 +881,7 @@ class Table;
...
@@ -881,6 +881,7 @@ class Table;
class
BaseString
;
class
BaseString
;
class
NdbEventOperation
;
class
NdbEventOperation
;
class
NdbBlob
;
class
NdbBlob
;
class
NdbReceiver
;
typedef
void
(
*
NdbEventCallback
)(
NdbEventOperation
*
,
Ndb
*
,
void
*
);
typedef
void
(
*
NdbEventCallback
)(
NdbEventOperation
*
,
Ndb
*
,
void
*
);
...
...
ndb/include/ndbapi/NdbReceiver.hpp
View file @
e58f9240
...
@@ -22,6 +22,8 @@
...
@@ -22,6 +22,8 @@
#include <ndb_global.h>
#include <ndb_global.h>
class
Ndb
;
class
Ndb
;
class
NdbConnection
;
class
NdbReceiver
class
NdbReceiver
{
{
friend
class
Ndb
;
friend
class
Ndb
;
...
...
ndb/include/ndbapi/NdbScanOperation.hpp
View file @
e58f9240
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
#include <NdbOperation.hpp>
#include <NdbOperation.hpp>
class
NdbBlob
;
class
NdbBlob
;
class
NdbResultSet
;
/**
/**
* @class NdbScanOperation
* @class NdbScanOperation
...
...
ndb/src/common/debugger/EventLogger.cpp
View file @
e58f9240
...
@@ -1343,7 +1343,7 @@ EventLogger::log(int eventType, const Uint32* theData, NodeId nodeId,
...
@@ -1343,7 +1343,7 @@ EventLogger::log(int eventType, const Uint32* theData, NodeId nodeId,
{
{
Uint32
threshold
=
0
;
Uint32
threshold
=
0
;
Logger
::
LoggerLevel
severity
=
Logger
::
LL_WARNING
;
Logger
::
LoggerLevel
severity
=
Logger
::
LL_WARNING
;
LogLevel
::
EventCategory
cat
;
LogLevel
::
EventCategory
cat
=
LogLevel
::
llInvalid
;
for
(
unsigned
i
=
0
;
i
<
EventLoggerBase
::
matrixSize
;
i
++
){
for
(
unsigned
i
=
0
;
i
<
EventLoggerBase
::
matrixSize
;
i
++
){
if
(
EventLoggerBase
::
matrix
[
i
].
eventType
==
eventType
){
if
(
EventLoggerBase
::
matrix
[
i
].
eventType
==
eventType
){
...
@@ -1354,6 +1354,9 @@ EventLogger::log(int eventType, const Uint32* theData, NodeId nodeId,
...
@@ -1354,6 +1354,9 @@ EventLogger::log(int eventType, const Uint32* theData, NodeId nodeId,
}
}
}
}
if
(
cat
==
LogLevel
::
llInvalid
)
return
;
Uint32
set
=
ll
?
ll
->
getLogLevel
(
cat
)
:
m_logLevel
.
getLogLevel
(
cat
);
Uint32
set
=
ll
?
ll
->
getLogLevel
(
cat
)
:
m_logLevel
.
getLogLevel
(
cat
);
if
(
threshold
<=
set
){
if
(
threshold
<=
set
){
switch
(
severity
){
switch
(
severity
){
...
...
ndb/src/common/util/ConfigValues.cpp
View file @
e58f9240
#include <ndb_global.h>
#include <ConfigValues.hpp>
#include <ConfigValues.hpp>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <new>
#include <NdbOut.hpp>
#include <NdbOut.hpp>
#include <NdbTCP.h>
#include <NdbTCP.h>
...
...
ndb/src/kernel/blocks/backup/restore/Restore.hpp
View file @
e58f9240
...
@@ -91,7 +91,7 @@ class TupleS {
...
@@ -91,7 +91,7 @@ class TupleS {
private:
private:
friend
class
RestoreDataIterator
;
friend
class
RestoreDataIterator
;
TableS
*
m_currentTable
;
class
TableS
*
m_currentTable
;
AttributeData
*
allAttrData
;
AttributeData
*
allAttrData
;
bool
prepareRecord
(
TableS
&
);
bool
prepareRecord
(
TableS
&
);
...
...
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
View file @
e58f9240
...
@@ -2369,7 +2369,7 @@ void Dbacc::execACC_COMMITREQ(Signal* signal)
...
@@ -2369,7 +2369,7 @@ void Dbacc::execACC_COMMITREQ(Signal* signal)
ptrCheckGuard
(
rootfragrecptr
,
crootfragmentsize
,
rootfragmentrec
);
ptrCheckGuard
(
rootfragrecptr
,
crootfragmentsize
,
rootfragmentrec
);
rootfragrecptr
.
p
->
noOfElements
++
;
rootfragrecptr
.
p
->
noOfElements
++
;
fragrecptr
.
p
->
slack
-=
operationRecPtr
.
p
->
insertDeleteLen
;
fragrecptr
.
p
->
slack
-=
operationRecPtr
.
p
->
insertDeleteLen
;
if
(
fragrecptr
.
p
->
slack
>=
(
Uint32
)(
1
<<
31
))
{
if
(
fragrecptr
.
p
->
slack
>=
(
1u
<<
31
))
{
/* IT MEANS THAT IF SLACK < ZERO */
/* IT MEANS THAT IF SLACK < ZERO */
if
(
fragrecptr
.
p
->
expandFlag
==
0
)
{
if
(
fragrecptr
.
p
->
expandFlag
==
0
)
{
jam
();
jam
();
...
@@ -2479,7 +2479,7 @@ void Dbacc::execACC_LOCKREQ(Signal* signal)
...
@@ -2479,7 +2479,7 @@ void Dbacc::execACC_LOCKREQ(Signal* signal)
Uint32
opCode
=
ZSCAN_OP
;
Uint32
opCode
=
ZSCAN_OP
;
signal
->
theData
[
0
]
=
operationRecPtr
.
i
;
signal
->
theData
[
0
]
=
operationRecPtr
.
i
;
signal
->
theData
[
1
]
=
fragrecptr
.
i
;
signal
->
theData
[
1
]
=
fragrecptr
.
i
;
signal
->
theData
[
2
]
=
opCode
|
(
lockMode
<<
4
)
|
(
1
<<
31
);
signal
->
theData
[
2
]
=
opCode
|
(
lockMode
<<
4
)
|
(
1
u
<<
31
);
signal
->
theData
[
3
]
=
req
->
hashValue
;
signal
->
theData
[
3
]
=
req
->
hashValue
;
signal
->
theData
[
4
]
=
1
;
// fake primKeyLen
signal
->
theData
[
4
]
=
1
;
// fake primKeyLen
signal
->
theData
[
5
]
=
req
->
transId1
;
signal
->
theData
[
5
]
=
req
->
transId1
;
...
@@ -6510,7 +6510,7 @@ void Dbacc::endofexpLab(Signal* signal)
...
@@ -6510,7 +6510,7 @@ void Dbacc::endofexpLab(Signal* signal)
Uint32
noOfBuckets
=
(
fragrecptr
.
p
->
maxp
+
1
)
+
fragrecptr
.
p
->
p
;
Uint32
noOfBuckets
=
(
fragrecptr
.
p
->
maxp
+
1
)
+
fragrecptr
.
p
->
p
;
Uint32
Thysteres
=
fragrecptr
.
p
->
maxloadfactor
-
fragrecptr
.
p
->
minloadfactor
;
Uint32
Thysteres
=
fragrecptr
.
p
->
maxloadfactor
-
fragrecptr
.
p
->
minloadfactor
;
fragrecptr
.
p
->
slackCheck
=
noOfBuckets
*
Thysteres
;
fragrecptr
.
p
->
slackCheck
=
noOfBuckets
*
Thysteres
;
if
(
fragrecptr
.
p
->
slack
>
(
Uint32
)(
1
<<
31
))
{
if
(
fragrecptr
.
p
->
slack
>
(
1u
<<
31
))
{
jam
();
jam
();
/* IT MEANS THAT IF SLACK < ZERO */
/* IT MEANS THAT IF SLACK < ZERO */
/* --------------------------------------------------------------------------------- */
/* --------------------------------------------------------------------------------- */
...
@@ -6974,7 +6974,7 @@ void Dbacc::execSHRINKCHECK2(Signal* signal)
...
@@ -6974,7 +6974,7 @@ void Dbacc::execSHRINKCHECK2(Signal* signal)
/*--------------------------------------------------------------*/
/*--------------------------------------------------------------*/
return
;
return
;
}
//if
}
//if
if
(
fragrecptr
.
p
->
slack
>
(
Uint32
)(
1
<<
31
))
{
if
(
fragrecptr
.
p
->
slack
>
(
1u
<<
31
))
{
jam
();
jam
();
/*--------------------------------------------------------------*/
/*--------------------------------------------------------------*/
/* THE SLACK IS NEGATIVE, IN THIS CASE WE WILL NOT NEED ANY */
/* THE SLACK IS NEGATIVE, IN THIS CASE WE WILL NOT NEED ANY */
...
@@ -7213,7 +7213,7 @@ void Dbacc::endofshrinkbucketLab(Signal* signal)
...
@@ -7213,7 +7213,7 @@ void Dbacc::endofshrinkbucketLab(Signal* signal)
expDirRangePtr
.
p
->
dirArray
[
fragrecptr
.
p
->
expSenderDirIndex
>>
8
]
=
RNIL
;
expDirRangePtr
.
p
->
dirArray
[
fragrecptr
.
p
->
expSenderDirIndex
>>
8
]
=
RNIL
;
}
//if
}
//if
}
//if
}
//if
if
(
fragrecptr
.
p
->
slack
<
(
Uint32
)(
1
<<
31
))
{
if
(
fragrecptr
.
p
->
slack
<
(
1u
<<
31
))
{
jam
();
jam
();
/*--------------------------------------------------------------*/
/*--------------------------------------------------------------*/
/* THE SLACK IS POSITIVE, IN THIS CASE WE WILL CHECK WHETHER */
/* THE SLACK IS POSITIVE, IN THIS CASE WE WILL CHECK WHETHER */
...
...
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
View file @
e58f9240
...
@@ -4618,6 +4618,7 @@ void Dbdih::execMASTER_GCPREQ(Signal* signal)
...
@@ -4618,6 +4618,7 @@ void Dbdih::execMASTER_GCPREQ(Signal* signal)
/* BUT NOT YET COMPLETED. */
/* BUT NOT YET COMPLETED. */
/*--------------------------------------------------*/
/*--------------------------------------------------*/
ndbrequire
(
false
);
ndbrequire
(
false
);
gcpState
=
MasterGCPConf
::
GCP_READY
;
// remove warning
break
;
break
;
default:
default:
/*------------------------------------------------*/
/*------------------------------------------------*/
...
@@ -4627,6 +4628,7 @@ void Dbdih::execMASTER_GCPREQ(Signal* signal)
...
@@ -4627,6 +4628,7 @@ void Dbdih::execMASTER_GCPREQ(Signal* signal)
/* NODE WHICH WAS NOT A MASTER NODE. */
/* NODE WHICH WAS NOT A MASTER NODE. */
/*------------------------------------------------*/
/*------------------------------------------------*/
ndbrequire
(
false
);
ndbrequire
(
false
);
gcpState
=
MasterGCPConf
::
GCP_READY
;
// remove warning
break
;
break
;
}
//switch
}
//switch
MasterGCPConf
*
const
masterGCPConf
=
(
MasterGCPConf
*
)
&
signal
->
theData
[
0
];
MasterGCPConf
*
const
masterGCPConf
=
(
MasterGCPConf
*
)
&
signal
->
theData
[
0
];
...
@@ -5535,6 +5537,7 @@ Dbdih::sendMASTER_LCPCONF(Signal * signal){
...
@@ -5535,6 +5537,7 @@ Dbdih::sendMASTER_LCPCONF(Signal * signal){
* it not allowed
* it not allowed
*/
*/
ndbrequire
(
false
);
ndbrequire
(
false
);
lcpState
=
MasterLCPConf
::
LCP_STATUS_IDLE
;
// remove warning
break
;
break
;
case
LCP_COPY_GCI
:
case
LCP_COPY_GCI
:
case
LCP_INIT_TABLES
:
case
LCP_INIT_TABLES
:
...
@@ -5543,6 +5546,7 @@ Dbdih::sendMASTER_LCPCONF(Signal * signal){
...
@@ -5543,6 +5546,7 @@ Dbdih::sendMASTER_LCPCONF(Signal * signal){
* These two states are handled by if statements above
* These two states are handled by if statements above
*/
*/
ndbrequire
(
false
);
ndbrequire
(
false
);
lcpState
=
MasterLCPConf
::
LCP_STATUS_IDLE
;
// remove warning
break
;
break
;
}
//switch
}
//switch
ndbrequire
(
ok
);
ndbrequire
(
ok
);
...
@@ -12738,6 +12742,7 @@ void Dbdih::setNodeRestartInfoBits()
...
@@ -12738,6 +12742,7 @@ void Dbdih::setNodeRestartInfoBits()
break
;
break
;
default:
default:
ndbrequire
(
false
);
ndbrequire
(
false
);
tsnrNodeActiveStatus
=
Sysfile
::
NS_NotDefined
;
// remove warning
break
;
break
;
}
//switch
}
//switch
Sysfile
::
setNodeStatus
(
nodePtr
.
i
,
SYSFILE
->
nodeStatus
,
Sysfile
::
setNodeStatus
(
nodePtr
.
i
,
SYSFILE
->
nodeStatus
,
...
...
ndb/src/kernel/blocks/dbtup/Dbtup.hpp
View file @
e58f9240
...
@@ -35,14 +35,6 @@
...
@@ -35,14 +35,6 @@
#define ZMIN_PAGE_LIMIT_TUPKEYREQ 5
#define ZMIN_PAGE_LIMIT_TUPKEYREQ 5
#define ZTUP_VERSION_BITS 15
#define ZTUP_VERSION_BITS 15
typedef
bool
(
Dbtup
::*
ReadFunction
)(
Uint32
*
,
AttributeHeader
*
,
Uint32
,
Uint32
);
typedef
bool
(
Dbtup
::*
UpdateFunction
)(
Uint32
*
,
Uint32
,
Uint32
);
#ifdef DBTUP_C
#ifdef DBTUP_C
//------------------------------------------------------------------
//------------------------------------------------------------------
// Jam Handling:
// Jam Handling:
...
@@ -351,6 +343,14 @@ typedef bool (Dbtup::* UpdateFunction)(Uint32*,
...
@@ -351,6 +343,14 @@ typedef bool (Dbtup::* UpdateFunction)(Uint32*,
class
Dbtup
:
public
SimulatedBlock
{
class
Dbtup
:
public
SimulatedBlock
{
public:
public:
typedef
bool
(
Dbtup
::*
ReadFunction
)(
Uint32
*
,
AttributeHeader
*
,
Uint32
,
Uint32
);
typedef
bool
(
Dbtup
::*
UpdateFunction
)(
Uint32
*
,
Uint32
,
Uint32
);
// State values
// State values
enum
State
{
enum
State
{
NOT_INITIALIZED
=
0
,
NOT_INITIALIZED
=
0
,
...
...
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
View file @
e58f9240
...
@@ -1100,7 +1100,7 @@ Dbtup::updateStartLab(Signal* signal,
...
@@ -1100,7 +1100,7 @@ Dbtup::updateStartLab(Signal* signal,
Tablerec
*
const
regTabPtr
,
Tablerec
*
const
regTabPtr
,
Page
*
const
pagePtr
)
Page
*
const
pagePtr
)
{
{
Uint32
retValue
;
int
retValue
;
if
(
regOperPtr
->
optype
==
ZINSERT
)
{
if
(
regOperPtr
->
optype
==
ZINSERT
)
{
jam
();
jam
();
setNullBits
(
pagePtr
,
regTabPtr
,
regOperPtr
->
pageOffset
);
setNullBits
(
pagePtr
,
regTabPtr
,
regOperPtr
->
pageOffset
);
...
...
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
View file @
e58f9240
...
@@ -200,7 +200,8 @@ Dbtup::tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* data
...
@@ -200,7 +200,8 @@ Dbtup::tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* data
operPtr
.
i
=
RNIL
;
operPtr
.
i
=
RNIL
;
operPtr
.
p
=
NULL
;
operPtr
.
p
=
NULL
;
// do it
// do it
int
ret
=
readAttributes
(
pagePtr
.
p
,
pageOffset
,
attrIds
,
numAttrs
,
dataOut
,
ZNIL
,
true
);
int
ret
=
readAttributes
(
pagePtr
.
p
,
pageOffset
,
attrIds
,
numAttrs
,
dataOut
,
ZNIL
,
true
);
// restore globals
// restore globals
tabptr
=
tabptr_old
;
tabptr
=
tabptr_old
;
fragptr
=
fragptr_old
;
fragptr
=
fragptr_old
;
...
@@ -220,7 +221,7 @@ Dbtup::tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* data
...
@@ -220,7 +221,7 @@ Dbtup::tuxReadPk(Uint32 fragPtrI, Uint32 pageId, Uint32 pageOffset, Uint32* data
n
+=
1
;
n
+=
1
;
i
+=
1
+
size
;
i
+=
1
+
size
;
}
}
ndbrequire
(
i
==
ret
);
ndbrequire
(
(
int
)
i
==
ret
);
ret
-=
numAttrs
;
ret
-=
numAttrs
;
}
else
{
}
else
{
ret
=
terrorCode
?
(
-
(
int
)
terrorCode
)
:
-
1
;
ret
=
terrorCode
?
(
-
(
int
)
terrorCode
)
:
-
1
;
...
...
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
View file @
e58f9240
...
@@ -652,6 +652,7 @@ void Dbtup::executeTrigger(Signal* signal,
...
@@ -652,6 +652,7 @@ void Dbtup::executeTrigger(Signal* signal,
return
;
return
;
default:
default:
ndbrequire
(
false
);
ndbrequire
(
false
);
executeDirect
=
false
;
// remove warning
}
//switch
}
//switch
regOperPtr
->
noFiredTriggers
++
;
regOperPtr
->
noFiredTriggers
++
;
...
@@ -1077,6 +1078,7 @@ Dbtup::executeTuxCommitTriggers(Signal* signal,
...
@@ -1077,6 +1078,7 @@ Dbtup::executeTuxCommitTriggers(Signal* signal,
ndbrequire
(
tupVersion
==
regOperPtr
->
tupVersion
);
ndbrequire
(
tupVersion
==
regOperPtr
->
tupVersion
);
}
else
{
}
else
{
ndbrequire
(
false
);
ndbrequire
(
false
);
tupVersion
=
0
;
// remove warning
}
}
// fill in constant part
// fill in constant part
req
->
tableId
=
regOperPtr
->
tableRef
;
req
->
tableId
=
regOperPtr
->
tableRef
;
...
@@ -1121,6 +1123,7 @@ Dbtup::executeTuxAbortTriggers(Signal* signal,
...
@@ -1121,6 +1123,7 @@ Dbtup::executeTuxAbortTriggers(Signal* signal,
return
;
return
;
}
else
{
}
else
{
ndbrequire
(
false
);
ndbrequire
(
false
);
tupVersion
=
0
;
// remove warning
}
}
// fill in constant part
// fill in constant part
req
->
tableId
=
regOperPtr
->
tableRef
;
req
->
tableId
=
regOperPtr
->
tableRef
;
...
...
ndb/src/mgmsrv/SignalQueue.cpp
View file @
e58f9240
...
@@ -14,8 +14,7 @@
...
@@ -14,8 +14,7 @@
along with this program; if not, write to the Free Software
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <string.h>
#include <ndb_global.h>
#include "SignalQueue.hpp"
#include "SignalQueue.hpp"
SignalQueue
::
SignalQueue
()
{
SignalQueue
::
SignalQueue
()
{
...
...
ndb/src/ndbapi/NdbConnection.cpp
View file @
e58f9240
...
@@ -313,8 +313,8 @@ NdbConnection::execute(ExecType aTypeOfExec,
...
@@ -313,8 +313,8 @@ NdbConnection::execute(ExecType aTypeOfExec,
tPrepOp
=
tPrepOp
->
next
();
tPrepOp
=
tPrepOp
->
next
();
}
}
// save rest of prepared ops if batch
// save rest of prepared ops if batch
NdbOperation
*
tRestOp
;
NdbOperation
*
tRestOp
=
0
;
NdbOperation
*
tLastOp
;
NdbOperation
*
tLastOp
=
0
;
if
(
tPrepOp
!=
NULL
)
{
if
(
tPrepOp
!=
NULL
)
{
tRestOp
=
tPrepOp
->
next
();
tRestOp
=
tPrepOp
->
next
();
tPrepOp
->
next
(
NULL
);
tPrepOp
->
next
(
NULL
);
...
...
ndb/src/ndbapi/NdbScanOperation.cpp
View file @
e58f9240
...
@@ -1182,7 +1182,7 @@ NdbIndexScanOperation::insertBOUNDS(Uint32 * data, Uint32 sz){
...
@@ -1182,7 +1182,7 @@ NdbIndexScanOperation::insertBOUNDS(Uint32 * data, Uint32 sz){
len
=
(
KeyInfo
::
DataLength
-
remaining
)
+
len
;
len
=
(
KeyInfo
::
DataLength
-
remaining
)
+
len
;
break
;
break
;
}
}
}
while
(
sz
>=
0
);
}
while
(
true
);
theTotalNrOfKeyWordInSignal
=
len
;
theTotalNrOfKeyWordInSignal
=
len
;
return
0
;
return
0
;
...
...
ndb/tools/waiter.cpp
View file @
e58f9240
...
@@ -15,8 +15,8 @@
...
@@ -15,8 +15,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <ndb_global.h>
#include <mgmapi.h>
#include <mgmapi.h>
#include <string.h>
#include <NdbMain.h>
#include <NdbMain.h>
#include <NdbOut.hpp>
#include <NdbOut.hpp>
#include <NdbSleep.h>
#include <NdbSleep.h>
...
...
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