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
d555950b
Commit
d555950b
authored
Sep 11, 2004
by
mskold@mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reomeved compiler warnings
parent
f3083b5e
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
21 additions
and
18 deletions
+21
-18
ndb/include/mgmcommon/ConfigRetriever.hpp
ndb/include/mgmcommon/ConfigRetriever.hpp
+1
-1
ndb/src/common/debugger/signaldata/ScanTab.cpp
ndb/src/common/debugger/signaldata/ScanTab.cpp
+1
-1
ndb/src/common/mgmcommon/ConfigRetriever.cpp
ndb/src/common/mgmcommon/ConfigRetriever.cpp
+2
-2
ndb/src/common/mgmcommon/LocalConfig.cpp
ndb/src/common/mgmcommon/LocalConfig.cpp
+1
-1
ndb/src/ndbapi/Ndb.cpp
ndb/src/ndbapi/Ndb.cpp
+2
-2
ndb/src/ndbapi/NdbDictionary.cpp
ndb/src/ndbapi/NdbDictionary.cpp
+2
-1
ndb/src/ndbapi/NdbDictionaryImpl.cpp
ndb/src/ndbapi/NdbDictionaryImpl.cpp
+4
-4
ndb/src/ndbapi/Ndbif.cpp
ndb/src/ndbapi/Ndbif.cpp
+7
-5
ndb/src/ndbapi/Ndbinit.cpp
ndb/src/ndbapi/Ndbinit.cpp
+1
-1
No files found.
ndb/include/mgmcommon/ConfigRetriever.hpp
View file @
d555950b
...
@@ -90,7 +90,7 @@ private:
...
@@ -90,7 +90,7 @@ private:
BaseString
_localConfigFileName
;
BaseString
_localConfigFileName
;
struct
LocalConfig
_localConfig
;
struct
LocalConfig
_localConfig
;
int
_ownNodeId
;
Uint32
_ownNodeId
;
BaseString
m_connectString
;
BaseString
m_connectString
;
...
...
ndb/src/common/debugger/signaldata/ScanTab.cpp
View file @
d555950b
...
@@ -82,7 +82,7 @@ printSCANTABCONF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 recei
...
@@ -82,7 +82,7 @@ printSCANTABCONF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 recei
fprintf
(
output
,
" Operation(s) [api tc rows len]:
\n
"
);
fprintf
(
output
,
" Operation(s) [api tc rows len]:
\n
"
);
ScanTabConf
::
OpData
*
op
=
(
ScanTabConf
::
OpData
*
)
ScanTabConf
::
OpData
*
op
=
(
ScanTabConf
::
OpData
*
)
(
theData
+
ScanTabConf
::
SignalLength
);
(
theData
+
ScanTabConf
::
SignalLength
);
for
(
in
t
i
=
0
;
i
<
op_count
;
i
++
){
for
(
size_
t
i
=
0
;
i
<
op_count
;
i
++
){
if
(
op
->
info
!=
ScanTabConf
::
EndOfData
)
if
(
op
->
info
!=
ScanTabConf
::
EndOfData
)
fprintf
(
output
,
" [0x%x 0x%x %d %d]"
,
fprintf
(
output
,
" [0x%x 0x%x %d %d]"
,
op
->
apiPtrI
,
op
->
tcPtrI
,
op
->
apiPtrI
,
op
->
tcPtrI
,
...
...
ndb/src/common/mgmcommon/ConfigRetriever.cpp
View file @
d555950b
...
@@ -94,7 +94,7 @@ ConfigRetriever::do_connect(){
...
@@ -94,7 +94,7 @@ ConfigRetriever::do_connect(){
while
(
retry
<
retry_max
){
while
(
retry
<
retry_max
){
Uint32
type
=
CR_ERROR
;
Uint32
type
=
CR_ERROR
;
BaseString
tmp
;
BaseString
tmp
;
for
(
int
i
=
0
;
i
<
_localConfig
.
ids
.
size
();
i
++
){
for
(
unsigned
int
i
=
0
;
i
<
_localConfig
.
ids
.
size
();
i
++
){
MgmtSrvrId
*
m
=
&
_localConfig
.
ids
[
i
];
MgmtSrvrId
*
m
=
&
_localConfig
.
ids
[
i
];
switch
(
m
->
type
){
switch
(
m
->
type
){
case
MgmId_TCP
:
case
MgmId_TCP
:
...
@@ -138,7 +138,7 @@ ConfigRetriever::getConfig() {
...
@@ -138,7 +138,7 @@ ConfigRetriever::getConfig() {
if
(
m_handle
!=
0
){
if
(
m_handle
!=
0
){
p
=
getConfig
(
m_handle
);
p
=
getConfig
(
m_handle
);
}
else
{
}
else
{
for
(
int
i
=
0
;
i
<
_localConfig
.
ids
.
size
();
i
++
){
for
(
unsigned
int
i
=
0
;
i
<
_localConfig
.
ids
.
size
();
i
++
){
MgmtSrvrId
*
m
=
&
_localConfig
.
ids
[
i
];
MgmtSrvrId
*
m
=
&
_localConfig
.
ids
[
i
];
switch
(
m
->
type
){
switch
(
m
->
type
){
case
MgmId_File
:
case
MgmId_File
:
...
...
ndb/src/common/mgmcommon/LocalConfig.cpp
View file @
d555950b
...
@@ -241,7 +241,7 @@ bool LocalConfig::readFile(const char * filename, bool &fopenError)
...
@@ -241,7 +241,7 @@ bool LocalConfig::readFile(const char * filename, bool &fopenError)
return
false
;
return
false
;
}
}
int
sz
=
1024
;
unsigned
int
sz
=
1024
;
char
*
theString
=
(
char
*
)
malloc
(
sz
);
char
*
theString
=
(
char
*
)
malloc
(
sz
);
theString
[
0
]
=
0
;
theString
[
0
]
=
0
;
...
...
ndb/src/ndbapi/Ndb.cpp
View file @
d555950b
...
@@ -1108,7 +1108,7 @@ void Ndb::setCatalogName(const char * a_catalog_name)
...
@@ -1108,7 +1108,7 @@ void Ndb::setCatalogName(const char * a_catalog_name)
int
len
=
snprintf
(
prefixName
,
sizeof
(
prefixName
),
"%s%c%s%c"
,
int
len
=
snprintf
(
prefixName
,
sizeof
(
prefixName
),
"%s%c%s%c"
,
theDataBase
,
table_name_separator
,
theDataBase
,
table_name_separator
,
theDataBaseSchema
,
table_name_separator
);
theDataBaseSchema
,
table_name_separator
);
prefixEnd
=
prefixName
+
(
len
<
sizeof
(
prefixName
)
?
len
:
prefixEnd
=
prefixName
+
(
len
<
(
int
)
sizeof
(
prefixName
)
?
len
:
sizeof
(
prefixName
)
-
1
);
sizeof
(
prefixName
)
-
1
);
}
}
}
}
...
@@ -1127,7 +1127,7 @@ void Ndb::setSchemaName(const char * a_schema_name)
...
@@ -1127,7 +1127,7 @@ void Ndb::setSchemaName(const char * a_schema_name)
int
len
=
snprintf
(
prefixName
,
sizeof
(
prefixName
),
"%s%c%s%c"
,
int
len
=
snprintf
(
prefixName
,
sizeof
(
prefixName
),
"%s%c%s%c"
,
theDataBase
,
table_name_separator
,
theDataBase
,
table_name_separator
,
theDataBaseSchema
,
table_name_separator
);
theDataBaseSchema
,
table_name_separator
);
prefixEnd
=
prefixName
+
(
len
<
sizeof
(
prefixName
)
?
len
:
prefixEnd
=
prefixName
+
(
len
<
(
int
)
sizeof
(
prefixName
)
?
len
:
sizeof
(
prefixName
)
-
1
);
sizeof
(
prefixName
)
-
1
);
}
}
}
}
...
...
ndb/src/ndbapi/NdbDictionary.cpp
View file @
d555950b
...
@@ -229,7 +229,8 @@ NdbDictionary::Table::Table(const char * name)
...
@@ -229,7 +229,8 @@ NdbDictionary::Table::Table(const char * name)
}
}
NdbDictionary
::
Table
::
Table
(
const
NdbDictionary
::
Table
&
org
)
NdbDictionary
::
Table
::
Table
(
const
NdbDictionary
::
Table
&
org
)
:
m_impl
(
*
new
NdbTableImpl
(
*
this
))
:
NdbDictionary
::
Object
(),
m_impl
(
*
new
NdbTableImpl
(
*
this
))
{
{
m_impl
.
assign
(
org
.
m_impl
);
m_impl
.
assign
(
org
.
m_impl
);
}
}
...
...
ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file @
d555950b
...
@@ -385,7 +385,7 @@ void
...
@@ -385,7 +385,7 @@ void
NdbTableImpl
::
buildColumnHash
(){
NdbTableImpl
::
buildColumnHash
(){
const
Uint32
size
=
m_columns
.
size
();
const
Uint32
size
=
m_columns
.
size
();
size_
t
i
;
in
t
i
;
for
(
i
=
31
;
i
>=
0
;
i
--
){
for
(
i
=
31
;
i
>=
0
;
i
--
){
if
(((
1
<<
i
)
&
size
)
!=
0
){
if
(((
1
<<
i
)
&
size
)
!=
0
){
m_columnHashMask
=
(
1
<<
(
i
+
1
))
-
1
;
m_columnHashMask
=
(
1
<<
(
i
+
1
))
-
1
;
...
@@ -395,7 +395,7 @@ NdbTableImpl::buildColumnHash(){
...
@@ -395,7 +395,7 @@ NdbTableImpl::buildColumnHash(){
Vector
<
Uint32
>
hashValues
;
Vector
<
Uint32
>
hashValues
;
Vector
<
Vector
<
Uint32
>
>
chains
;
chains
.
fill
(
size
,
hashValues
);
Vector
<
Vector
<
Uint32
>
>
chains
;
chains
.
fill
(
size
,
hashValues
);
for
(
i
=
0
;
i
<
size
;
i
++
){
for
(
i
=
0
;
i
<
(
int
)
size
;
i
++
){
Uint32
hv
=
Hash
(
m_columns
[
i
]
->
getName
())
&
0xFFFE
;
Uint32
hv
=
Hash
(
m_columns
[
i
]
->
getName
())
&
0xFFFE
;
Uint32
bucket
=
hv
&
m_columnHashMask
;
Uint32
bucket
=
hv
&
m_columnHashMask
;
bucket
=
(
bucket
<
size
?
bucket
:
bucket
-
size
);
bucket
=
(
bucket
<
size
?
bucket
:
bucket
-
size
);
...
@@ -409,7 +409,7 @@ NdbTableImpl::buildColumnHash(){
...
@@ -409,7 +409,7 @@ NdbTableImpl::buildColumnHash(){
m_columnHash
.
fill
((
unsigned
)
size
-
1
,
tmp
);
// Default no chaining
m_columnHash
.
fill
((
unsigned
)
size
-
1
,
tmp
);
// Default no chaining
Uint32
pos
=
0
;
// In overflow vector
Uint32
pos
=
0
;
// In overflow vector
for
(
i
=
0
;
i
<
size
;
i
++
){
for
(
i
=
0
;
i
<
(
int
)
size
;
i
++
){
Uint32
sz
=
chains
[
i
].
size
();
Uint32
sz
=
chains
[
i
].
size
();
if
(
sz
==
1
){
if
(
sz
==
1
){
Uint32
col
=
chains
[
i
][
0
];
Uint32
col
=
chains
[
i
][
0
];
...
@@ -1368,7 +1368,7 @@ NdbDictInterface::createOrAlterTable(Ndb & ndb,
...
@@ -1368,7 +1368,7 @@ NdbDictInterface::createOrAlterTable(Ndb & ndb,
internalName
);
internalName
);
bool
haveAutoIncrement
=
false
;
bool
haveAutoIncrement
=
false
;
Uint64
autoIncrementValue
;
Uint64
autoIncrementValue
=
0
;
for
(
i
=
0
;
i
<
sz
;
i
++
){
for
(
i
=
0
;
i
<
sz
;
i
++
){
const
NdbColumnImpl
*
col
=
impl
.
m_columns
[
i
];
const
NdbColumnImpl
*
col
=
impl
.
m_columns
[
i
];
if
(
col
==
0
)
if
(
col
==
0
)
...
...
ndb/src/ndbapi/Ndbif.cpp
View file @
d555950b
...
@@ -375,7 +375,8 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
...
@@ -375,7 +375,8 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
break
;
break
;
case
NdbReceiver
:
:
NDB_SCANRECEIVER
:
case
NdbReceiver
:
:
NDB_SCANRECEIVER
:
tCon
->
theScanningOp
->
receiver_delivered
(
tRec
);
tCon
->
theScanningOp
->
receiver_delivered
(
tRec
);
theWaiter
.
m_state
=
(
tWaitState
==
WAIT_SCAN
?
NO_WAIT
:
tWaitState
);
theWaiter
.
m_state
=
(((
WaitSignalType
)
tWaitState
)
==
WAIT_SCAN
?
(
Uint32
)
NO_WAIT
:
tWaitState
);
break
;
break
;
default:
default:
goto
InvalidSignal
;
goto
InvalidSignal
;
...
@@ -747,7 +748,8 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
...
@@ -747,7 +748,8 @@ Ndb::handleReceivedSignal(NdbApiSignal* aSignal, LinearSectionPtr ptr[3])
switch
(
com
){
switch
(
com
){
case
1
:
case
1
:
tCon
->
theScanningOp
->
receiver_delivered
(
tRec
);
tCon
->
theScanningOp
->
receiver_delivered
(
tRec
);
theWaiter
.
m_state
=
(
tWaitState
==
WAIT_SCAN
?
NO_WAIT
:
tWaitState
);
theWaiter
.
m_state
=
(((
WaitSignalType
)
tWaitState
)
==
WAIT_SCAN
?
(
Uint32
)
NO_WAIT
:
tWaitState
);
break
;
break
;
case
0
:
case
0
:
break
;
break
;
...
@@ -871,8 +873,8 @@ Ndb::completedTransaction(NdbConnection* aCon)
...
@@ -871,8 +873,8 @@ Ndb::completedTransaction(NdbConnection* aCon)
return
;
return
;
}
//if
}
//if
}
else
{
}
else
{
ndbout
<<
"theNoOfSentTransactions = "
<<
theNoOfSentTransactions
;
ndbout
<<
"theNoOfSentTransactions = "
<<
(
int
)
theNoOfSentTransactions
;
ndbout
<<
" theListState = "
<<
aCon
->
theListState
;
ndbout
<<
" theListState = "
<<
(
int
)
aCon
->
theListState
;
ndbout
<<
" theTransArrayIndex = "
<<
aCon
->
theTransArrayIndex
;
ndbout
<<
" theTransArrayIndex = "
<<
aCon
->
theTransArrayIndex
;
ndbout
<<
endl
<<
flush
;
ndbout
<<
endl
<<
flush
;
#ifdef VM_TRACE
#ifdef VM_TRACE
...
@@ -923,7 +925,7 @@ Ndb::pollCompleted(NdbConnection** aCopyArray)
...
@@ -923,7 +925,7 @@ Ndb::pollCompleted(NdbConnection** aCopyArray)
aCopyArray
[
i
]
=
theCompletedTransactionsArray
[
i
];
aCopyArray
[
i
]
=
theCompletedTransactionsArray
[
i
];
if
(
aCopyArray
[
i
]
->
theListState
!=
NdbConnection
::
InCompletedList
)
{
if
(
aCopyArray
[
i
]
->
theListState
!=
NdbConnection
::
InCompletedList
)
{
ndbout
<<
"pollCompleted error "
;
ndbout
<<
"pollCompleted error "
;
ndbout
<<
aCopyArray
[
i
]
->
theListState
<<
endl
;
ndbout
<<
(
int
)
aCopyArray
[
i
]
->
theListState
<<
endl
;
abort
();
abort
();
}
//if
}
//if
theCompletedTransactionsArray
[
i
]
=
NULL
;
theCompletedTransactionsArray
[
i
]
=
NULL
;
...
...
ndb/src/ndbapi/Ndbinit.cpp
View file @
d555950b
...
@@ -130,7 +130,7 @@ Ndb::Ndb( const char* aDataBase , const char* aSchema) :
...
@@ -130,7 +130,7 @@ Ndb::Ndb( const char* aDataBase , const char* aSchema) :
int
len
=
snprintf
(
prefixName
,
sizeof
(
prefixName
),
"%s%c%s%c"
,
int
len
=
snprintf
(
prefixName
,
sizeof
(
prefixName
),
"%s%c%s%c"
,
theDataBase
,
table_name_separator
,
theDataBase
,
table_name_separator
,
theDataBaseSchema
,
table_name_separator
);
theDataBaseSchema
,
table_name_separator
);
prefixEnd
=
prefixName
+
(
len
<
sizeof
(
prefixName
)
?
len
:
prefixEnd
=
prefixName
+
(
len
<
(
int
)
sizeof
(
prefixName
)
?
len
:
sizeof
(
prefixName
)
-
1
);
sizeof
(
prefixName
)
-
1
);
NdbMutex_Lock
(
&
createNdbMutex
);
NdbMutex_Lock
(
&
createNdbMutex
);
...
...
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