4617 jonas oreland 2011-10-21
ndb - warnings (back port from 5.5)
modified:
storage/ndb/src/common/debugger/EventLogger.cpp
storage/ndb/src/common/debugger/SignalLoggerManager.cpp
storage/ndb/src/common/logger/LogHandler.cpp
storage/ndb/src/common/logger/Logger.cpp
storage/ndb/src/common/portlib/NdbConfig.c
storage/ndb/src/common/portlib/NdbDir.cpp
storage/ndb/src/common/portlib/NdbThread.c
storage/ndb/src/common/transporter/TransporterRegistry.cpp
storage/ndb/src/common/util/BaseString.cpp
storage/ndb/src/common/util/ConfigValues.cpp
storage/ndb/src/common/util/File.cpp
storage/ndb/src/common/util/InputStream.cpp
storage/ndb/src/common/util/NdbSqlUtil.cpp
storage/ndb/src/common/util/Parser.cpp
storage/ndb/src/common/util/Properties.cpp
storage/ndb/src/common/util/socket_io.cpp
storage/ndb/src/cw/cpcd/APIService.cpp
storage/ndb/src/cw/cpcd/CPCD.cpp
storage/ndb/src/cw/cpcd/Monitor.cpp
storage/ndb/src/cw/cpcd/Process.cpp
storage/ndb/src/kernel/blocks/backup/read.cpp
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
storage/ndb/src/kernel/error/ErrorReporter.cpp
storage/ndb/src/mgmapi/mgmapi.cpp
storage/ndb/src/mgmclient/CommandInterpreter.cpp
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
storage/ndb/src/mgmsrv/Services.cpp
storage/ndb/src/ndbapi/NdbBlob.cpp
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
storage/ndb/test/ndbapi/ScanFunctions.hpp
storage/ndb/test/src/DbUtil.cpp
storage/ndb/test/src/HugoQueries.cpp
storage/ndb/test/src/HugoQueryBuilder.cpp
storage/ndb/test/src/NDBT_Test.cpp
storage/ndb/test/src/NdbBackup.cpp
storage/ndb/test/src/NdbRestarter.cpp
storage/ndb/test/src/getarg.c
storage/ndb/test/tools/cpcc.cpp
storage/ndb/tools/restore/consumer_restore.cpp
storage/ndb/tools/waiter.cpp
4616 jonas oreland 2011-10-21 [merge]
ndb - merge 63 to 70
modified:
config/ac-macros/misc.m4
4615 jonas oreland 2011-10-20
ndb - warnings stab 3
modified:
sql/ha_ndbcluster.cc
storage/ndb/src/common/util/ndbzio.c
storage/ndb/src/kernel/blocks/ndbfs/Win32AsyncFile.cpp
storage/ndb/tools/ndb_dump_frm_data.cpp
=== modified file 'config/ac-macros/misc.m4'
--- a/config/ac-macros/misc.m4 2009-11-04 23:08:21 +0000
+++ b/config/ac-macros/misc.m4 2011-10-21 08:30:40 +0000
@@ -460,22 +460,23 @@ AC_DEFUN([MYSQL_STACK_DIRECTION],
#if defined(__HP_cc) || defined (__HP_aCC) || defined (__hpux)
#pragma noinline
#endif
- int find_stack_direction ()
- {
- static char *addr = 0;
- auto char dummy;
- if (addr == 0)
- {
- addr = &dummy;
- return find_stack_direction ();
- }
- else
- return (&dummy > addr) ? 1 : -1;
- }
- int main ()
- {
- exit (find_stack_direction() < 0);
- }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+ /* Check stack direction (0-down, 1-up) */
+ int f(int *a)
+ {
+ int b;
+ return(&b > a)?1:-1;
+ }
+ /*
+ Prevent compiler optimizations by calling function
+ through pointer.
+ */
+ volatile int (*ptr_f)(int *) = f;
+ int main()
+ {
+ int a;
+ exit(ptr_f(&a) < 0);
+ }
+ ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
ac_cv_c_stack_direction=)])
AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
])dnl
=== modified file 'storage/ndb/src/common/debugger/EventLogger.cpp'
--- a/storage/ndb/src/common/debugger/EventLogger.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/debugger/EventLogger.cpp 2011-10-21 08:59:23 +0000
@@ -1524,7 +1524,7 @@ EventLogger::getText(char * dst, size_t
if (nodeId != 0)
{
BaseString::snprintf(dst, dst_len, "Node %u: ", nodeId);
- pos= strlen(dst);
+ pos= (int)strlen(dst);
}
if (dst_len-pos > 0)
textF(dst+pos, dst_len-pos, theData, len);
=== modified file 'storage/ndb/src/common/debugger/SignalLoggerManager.cpp'
--- a/storage/ndb/src/common/debugger/SignalLoggerManager.cpp 2011-01-30 20:56:00 +0000
+++ b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp 2011-10-21 08:59:23 +0000
@@ -126,7 +126,7 @@ getParameter(char *blocks[NO_OF_BLOCKS],
char * tmp = copy;
bool done = false;
while(!done){
- int len = strcspn(tmp, ", ;:\0");
+ int len = (int)strcspn(tmp, ", ;:\0");
if(len == 0)
done = true;
else {
=== modified file 'storage/ndb/src/common/logger/LogHandler.cpp'
--- a/storage/ndb/src/common/logger/LogHandler.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/logger/LogHandler.cpp 2011-10-21 08:59:23 +0000
@@ -175,7 +175,7 @@ LogHandler::parseParams(const BaseString
bool ret = true;
_params.split(v_args, ",");
- for(size_t i=0; i < v_args.size(); i++) {
+ for(unsigned i=0; i < v_args.size(); i++) {
Vector<BaseString> v_param_value;
if(v_args[i].split(v_param_value, "=", 2) != 2)
{
=== modified file 'storage/ndb/src/common/logger/Logger.cpp'
--- a/storage/ndb/src/common/logger/Logger.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/logger/Logger.cpp 2011-10-21 08:59:23 +0000
@@ -212,13 +212,12 @@ Logger::addHandler(LogHandler* pHandler)
bool
Logger::addHandler(const BaseString &logstring, int *err, int len, char* errStr) {
- size_t i;
Vector<BaseString> logdest;
DBUG_ENTER("Logger::addHandler");
logstring.split(logdest, ";");
- for(i = 0; i < logdest.size(); i++) {
+ for(unsigned i = 0; i < logdest.size(); i++) {
DBUG_PRINT("info",("adding: %s",logdest[i].c_str()));
Vector<BaseString> v_type_args;
=== modified file 'storage/ndb/src/common/portlib/NdbConfig.c'
--- a/storage/ndb/src/common/portlib/NdbConfig.c 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/portlib/NdbConfig.c 2011-10-21 08:59:23 +0000
@@ -31,14 +31,14 @@ NdbConfig_get_path(int *_len)
const char *path= NdbEnv_GetEnv("NDB_HOME", 0, 0);
int path_len= 0;
if (path)
- path_len= strlen(path);
+ path_len= (int)strlen(path);
if (path_len == 0 && datadir_path) {
path= datadir_path;
- path_len= strlen(path);
+ path_len= (int)strlen(path);
}
if (path_len == 0) {
path= ".";
- path_len= strlen(path);
+ path_len= (int)strlen(path);
}
if (_len)
*_len= path_len;
@@ -68,7 +68,7 @@ NdbConfig_NdbCfgName(int with_ndb_home){
if (with_ndb_home) {
buf= NdbConfig_AllocHomePath(PATH_MAX);
- len= strlen(buf);
+ len= (int)strlen(buf);
} else
buf= NdbMem_Allocate(PATH_MAX);
basestring_snprintf(buf+len, PATH_MAX, "Ndb.cfg");
@@ -87,7 +87,7 @@ char *get_prefix_buf(int len, int node_i
NdbHost_GetProcessId());
tmp_buf[sizeof(tmp_buf)-1]= 0;
- buf= NdbConfig_AllocHomePath(len+strlen(tmp_buf));
+ buf= NdbConfig_AllocHomePath(len+(int)strlen(tmp_buf));
strcat(buf, tmp_buf);
return buf;
}
@@ -95,7 +95,7 @@ char *get_prefix_buf(int len, int node_i
char*
NdbConfig_ErrorFileName(int node_id){
char *buf= get_prefix_buf(PATH_MAX, node_id);
- int len= strlen(buf);
+ int len= (int)strlen(buf);
basestring_snprintf(buf+len, PATH_MAX, "_error.log");
return buf;
}
@@ -103,7 +103,7 @@ NdbConfig_ErrorFileName(int node_id){
char*
NdbConfig_ClusterLogFileName(int node_id){
char *buf= get_prefix_buf(PATH_MAX, node_id);
- int len= strlen(buf);
+ int len= (int)strlen(buf);
basestring_snprintf(buf+len, PATH_MAX, "_cluster.log");
return buf;
}
@@ -111,7 +111,7 @@ NdbConfig_ClusterLogFileName(int node_id
char*
NdbConfig_SignalLogFileName(int node_id){
char *buf= get_prefix_buf(PATH_MAX, node_id);
- int len= strlen(buf);
+ int len= (int)strlen(buf);
basestring_snprintf(buf+len, PATH_MAX, "_signal.log");
return buf;
}
@@ -119,7 +119,7 @@ NdbConfig_SignalLogFileName(int node_id)
char*
NdbConfig_TraceFileName(int node_id, int file_no){
char *buf= get_prefix_buf(PATH_MAX, node_id);
- int len= strlen(buf);
+ int len= (int)strlen(buf);
basestring_snprintf(buf+len, PATH_MAX, "_trace.log.%u", file_no);
return buf;
}
@@ -127,7 +127,7 @@ NdbConfig_TraceFileName(int node_id, int
char*
NdbConfig_NextTraceFileName(int node_id){
char *buf= get_prefix_buf(PATH_MAX, node_id);
- int len= strlen(buf);
+ int len= (int)strlen(buf);
basestring_snprintf(buf+len, PATH_MAX, "_trace.log.next");
return buf;
}
@@ -135,7 +135,7 @@ NdbConfig_NextTraceFileName(int node_id)
char*
NdbConfig_PidFileName(int node_id){
char *buf= get_prefix_buf(PATH_MAX, node_id);
- int len= strlen(buf);
+ int len= (int)strlen(buf);
basestring_snprintf(buf+len, PATH_MAX, ".pid");
return buf;
}
@@ -143,7 +143,7 @@ NdbConfig_PidFileName(int node_id){
char*
NdbConfig_StdoutFileName(int node_id){
char *buf= get_prefix_buf(PATH_MAX, node_id);
- int len= strlen(buf);
+ int len= (int)strlen(buf);
basestring_snprintf(buf+len, PATH_MAX, "_out.log");
return buf;
}
=== modified file 'storage/ndb/src/common/portlib/NdbDir.cpp'
--- a/storage/ndb/src/common/portlib/NdbDir.cpp 2011-01-30 23:13:49 +0000
+++ b/storage/ndb/src/common/portlib/NdbDir.cpp 2011-10-21 08:59:23 +0000
@@ -280,7 +280,7 @@ NdbDir::remove_recursive(const char* dir
fprintf(stderr, "Too long path to remove: '%s'\n", dir);
return false;
}
- int start_len = strlen(path);
+ int start_len = (int)strlen(path);
const char* name;
NdbDir::Iterator iter;
@@ -298,7 +298,7 @@ loop:
if ((strcmp(".", name) == 0) || (strcmp("..", name) == 0))
continue;
- int end_len, len = strlen(path);
+ int end_len, len = (int)strlen(path);
if ((end_len = basestring_snprintf(path + len, sizeof(path) - len,
"%s", name)) < 0)
{
@@ -329,7 +329,7 @@ loop:
}
iter.close();
- int len = strlen(path);
+ int len = (int)strlen(path);
path[len - 1] = 0; // remove ending slash
char * prev_slash = strrchr(path, IF_WIN('\\', '/'));
=== modified file 'storage/ndb/src/common/portlib/NdbThread.c'
--- a/storage/ndb/src/common/portlib/NdbThread.c 2011-10-07 07:37:47 +0000
+++ b/storage/ndb/src/common/portlib/NdbThread.c 2011-10-21 08:59:23 +0000
@@ -253,7 +253,11 @@ NdbThread_Create(NDB_THREAD_FUNC *p_thre
thread_stack_size = PTHREAD_STACK_MIN;
#endif
DBUG_PRINT("info", ("stack_size: %llu", (ulonglong)thread_stack_size));
+#ifndef _WIN32
pthread_attr_setstacksize(&thread_attr, thread_stack_size);
+#else
+ pthread_attr_setstacksize(&thread_attr, (DWORD)thread_stack_size);
+#endif
#ifdef USE_PTHREAD_EXTRAS
/* Guard stack overflow with a 2k databuffer */
pthread_attr_setguardsize(&thread_attr, 2048);
=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp 2011-09-09 10:48:14 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp 2011-10-21 08:59:23 +0000
@@ -2418,7 +2418,7 @@ TransporterRegistry::print_transporters(
out << "<<" << endl;
- for (size_t i= 0; i < m_transporter_interface.size(); i++){
+ for (unsigned i= 0; i < m_transporter_interface.size(); i++){
Transporter_interface tf= m_transporter_interface[i];
out << i
=== modified file 'storage/ndb/src/common/util/BaseString.cpp'
--- a/storage/ndb/src/common/util/BaseString.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/util/BaseString.cpp 2011-10-21 08:59:23 +0000
@@ -50,7 +50,7 @@ BaseString::BaseString(const char* s)
return;
}
memcpy(m_chr, s, n + 1);
- m_len = n;
+ m_len = (unsigned)n;
}
BaseString::BaseString(const char * s, size_t n)
@@ -70,7 +70,7 @@ BaseString::BaseString(const char * s, s
}
memcpy(m_chr, s, n);
m_chr[n] = 0;
- m_len = n;
+ m_len = (unsigned)n;
}
BaseString::BaseString(const BaseString& str)
@@ -93,7 +93,7 @@ BaseString::BaseString(const BaseString&
}
memcpy(t, s, n + 1);
m_chr = t;
- m_len = n;
+ m_len = (unsigned)n;
}
BaseString::~BaseString()
@@ -125,7 +125,7 @@ BaseString::assign(const char* s)
}
delete[] m_chr;
m_chr = t;
- m_len = n;
+ m_len = (unsigned)n;
return *this;
}
@@ -145,7 +145,7 @@ BaseString::assign(const char* s, size_t
}
delete[] m_chr;
m_chr = t;
- m_len = n;
+ m_len = (unsigned)n;
return *this;
}
@@ -178,7 +178,7 @@ BaseString::append(const char* s)
}
delete[] m_chr;
m_chr = t;
- m_len += n;
+ m_len += (unsigned)n;
return *this;
}
@@ -196,7 +196,7 @@ BaseString::append(const BaseString& str
BaseString&
BaseString::append(const Vector<BaseString> &vector,
const BaseString &separator) {
- for(size_t i=0;i<vector.size(); i++) {
+ for(unsigned i=0;i<vector.size(); i++) {
append(vector[i]);
if(i<vector.size()-1)
append(separator);
@@ -232,7 +232,7 @@ BaseString::assfmt(const char *fmt, ...)
l = basestring_vsnprintf(m_chr, l, fmt, ap);
assert(l == (int)strlen(m_chr));
va_end(ap);
- m_len = strlen(m_chr);
+ m_len = (unsigned)strlen(m_chr);
return *this;
}
@@ -279,7 +279,7 @@ BaseString::split(Vector<BaseString> &v,
int maxSize) const {
char *str = strdup(m_chr);
int i, start, len, num = 0;
- len = strlen(str);
+ len = (int)strlen(str);
for(start = i = 0;
(i <= len) && ( (maxSize<0) || ((int)v.size()<=maxSize-1) );
i++) {
@@ -360,7 +360,7 @@ BaseString::argify(const char *argv0, co
char *tmp = new char[strlen(src)+1];
if (tmp == NULL)
{
- for(size_t i = 0; i < vargv.size(); i++)
+ for(unsigned i = 0; i < vargv.size(); i++)
free(vargv[i]);
errno = ENOMEM;
return NULL;
@@ -413,7 +413,7 @@ BaseString::argify(const char *argv0, co
if (t == NULL)
{
delete[] tmp;
- for(size_t i = 0; i < vargv.size(); i++)
+ for(unsigned i = 0; i < vargv.size(); i++)
free(vargv[i]);
errno = ENOMEM;
return NULL;
@@ -422,7 +422,7 @@ BaseString::argify(const char *argv0, co
{
free(t);
delete[] tmp;
- for(size_t i = 0; i < vargv.size(); i++)
+ for(unsigned i = 0; i < vargv.size(); i++)
free(vargv[i]);
return NULL;
}
@@ -433,7 +433,7 @@ BaseString::argify(const char *argv0, co
delete[] tmp;
if (vargv.push_back(NULL))
{
- for(size_t i = 0; i < vargv.size(); i++)
+ for(unsigned i = 0; i < vargv.size(); i++)
free(vargv[i]);
return NULL;
}
@@ -444,13 +444,13 @@ BaseString::argify(const char *argv0, co
char **argv = (char **)malloc(sizeof(*argv) * (vargv.size()));
if(argv == NULL)
{
- for(size_t i = 0; i < vargv.size(); i++)
+ for(unsigned i = 0; i < vargv.size(); i++)
free(vargv[i]);
errno = ENOMEM;
return NULL;
}
- for(size_t i = 0; i < vargv.size(); i++){
+ for(unsigned i = 0; i < vargv.size(); i++){
argv[i] = vargv[i];
}
@@ -460,13 +460,13 @@ BaseString::argify(const char *argv0, co
BaseString&
BaseString::trim(const char * delim){
trim(m_chr, delim);
- m_len = strlen(m_chr);
+ m_len = (unsigned)strlen(m_chr);
return * this;
}
char*
BaseString::trim(char * str, const char * delim){
- int len = strlen(str) - 1;
+ int len = (int)strlen(str) - 1;
for(; len > 0 && strchr(delim, str[len]); len--)
;
=== modified file 'storage/ndb/src/common/util/ConfigValues.cpp'
--- a/storage/ndb/src/common/util/ConfigValues.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/util/ConfigValues.cpp 2011-10-21 08:59:23 +0000
@@ -593,7 +593,7 @@ ConfigValues::getPackedSize() const {
break;
case StringType:
size += 8; // key + len
- size += mod4(strlen(* getString(m_values[i+1])) + 1);
+ size += mod4((unsigned)strlen(* getString(m_values[i+1])) + 1);
break;
case InvalidType:
default:
=== modified file 'storage/ndb/src/common/util/File.cpp'
--- a/storage/ndb/src/common/util/File.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/util/File.cpp 2011-10-21 08:59:23 +0000
@@ -148,13 +148,13 @@ File_class::close()
int
File_class::read(void* buf, size_t itemSize, size_t nitems) const
{
- return ::fread(buf, itemSize, nitems, m_file);
+ return (int)::fread(buf, itemSize, nitems, m_file);
}
int
File_class::readChar(char* buf, long start, long length) const
{
- return ::fread((void*)&buf[start], 1, length, m_file);
+ return (int)::fread((void*)&buf[start], 1, length, m_file);
}
int
@@ -166,13 +166,13 @@ File_class::readChar(char* buf)
int
File_class::write(const void* buf, size_t size_arg, size_t nitems)
{
- return ::fwrite(buf, size_arg, nitems, m_file);
+ return (int)::fwrite(buf, size_arg, nitems, m_file);
}
int
File_class::writeChar(const char* buf, long start, long length)
{
- return ::fwrite((const void*)&buf[start], sizeof(char), length, m_file);
+ return (int)::fwrite((const void*)&buf[start], sizeof(char), length, m_file);
}
int
=== modified file 'storage/ndb/src/common/util/InputStream.cpp'
--- a/storage/ndb/src/common/util/InputStream.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/util/InputStream.cpp 2011-10-21 08:59:23 +0000
@@ -57,7 +57,7 @@ SocketInputStream::gets(char * buf, int
m_startover= false;
}
else
- offset= strlen(buf);
+ offset= (int)strlen(buf);
int time= 0;
int res = readln_socket(m_socket, m_timeout_remain, &time,
=== modified file 'storage/ndb/src/common/util/NdbSqlUtil.cpp'
--- a/storage/ndb/src/common/util/NdbSqlUtil.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/util/NdbSqlUtil.cpp 2011-10-21 08:59:23 +0000
@@ -693,7 +693,7 @@ NdbSqlUtil::likeChar(const void* info, c
const char* v2 = (const char*)p2;
CHARSET_INFO* cs = (CHARSET_INFO*)(info);
// strip end spaces to match (incorrect) MySQL behaviour
- n1 = (*cs->cset->lengthsp)(cs, v1, n1);
+ n1 = (unsigned)(*cs->cset->lengthsp)(cs, v1, n1);
int k = (*cs->coll->wildcmp)(cs, v1, v1 + n1, v2, v2 + n2, ndb_wild_prefix, ndb_wild_one, ndb_wild_many);
return k == 0 ? 0 : +1;
}
@@ -980,13 +980,13 @@ NdbSqlUtil::strnxfrm_bug7284(CHARSET_INF
if (n1 <= 0)
return -1;
// strxfrm to binary
- int n2 = ndb_strnxfrm(cs, xsp, sizeof(xsp), nsp, n1);
+ int n2 = (int)ndb_strnxfrm(cs, xsp, sizeof(xsp), nsp, n1);
if (n2 <= 0)
return -1;
// XXX bug workaround - strnxfrm may not write full string
memset(dst, 0x0, dstLen);
// strxfrm argument string - returns no error indication
- int n3 = ndb_strnxfrm(cs, dst, dstLen, src, srcLen);
+ int n3 = (int)ndb_strnxfrm(cs, dst, dstLen, src, srcLen);
// pad with strxfrm-ed space chars
int n4 = n3;
while (n4 < (int)dstLen) {
=== modified file 'storage/ndb/src/common/util/Parser.cpp'
--- a/storage/ndb/src/common/util/Parser.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/util/Parser.cpp 2011-10-21 08:59:23 +0000
@@ -78,7 +78,7 @@ bool
Empty(const char * str){
if(str == 0)
return true;
- const int len = strlen(str);
+ const int len = (int)strlen(str);
if(len == 0)
return false;
for(int i = 0; i<len; i++)
@@ -96,7 +96,7 @@ void
trim(char * str){
if(str == NULL)
return;
- int len = strlen(str);
+ int len = (int)strlen(str);
for(len--; str[len] == '\n' || str[len] == ' ' || str[len] == '\t'; len--)
str[len] = 0;
@@ -156,7 +156,7 @@ ParserImpl::run(Context * ctx, const cla
return false;
}
- int last= strlen(ctx->m_currentToken);
+ int last= (int)strlen(ctx->m_currentToken);
if(last>0)
last--;
=== modified file 'storage/ndb/src/common/util/Properties.cpp'
--- a/storage/ndb/src/common/util/Properties.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/util/Properties.cpp 2011-10-21 08:59:23 +0000
@@ -662,10 +662,10 @@ PropertiesImpl::getPackedSize(Uint32 pLe
sz += 4; // Type
sz += 4; // Name Len
sz += 4; // Value Len
- sz += mod4(pLen + strlen(content[i]->name)); // Name
+ sz += mod4(pLen + (unsigned)strlen(content[i]->name)); // Name
switch(content[i]->valueType){
case PropertiesType_char:
- sz += mod4(strlen((char *)content[i]->value));
+ sz += mod4((unsigned)strlen((char *)content[i]->value));
break;
case PropertiesType_Uint32:
sz += mod4(4);
@@ -734,7 +734,7 @@ PropertiesImpl::pack(Uint32 *& buf, cons
CharBuf charBuf;
for(unsigned int i = 0; i<items; i++){
- const int strLenName = strlen(content[i]->name);
+ const int strLenName = (int)strlen(content[i]->name);
if(content[i]->valueType == PropertiesType_Properties){
charBuf.clear();
=== modified file 'storage/ndb/src/common/util/socket_io.cpp'
--- a/storage/ndb/src/common/util/socket_io.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/common/util/socket_io.cpp 2011-10-21 08:59:23 +0000
@@ -123,7 +123,7 @@ readln_socket(NDB_SOCKET_TYPE socket, in
*time = 0;
ptr[0]= 0;
- return ptr - buf;
+ return (int)(ptr - buf);
}
}
@@ -226,7 +226,7 @@ vprint_socket(NDB_SOCKET_TYPE socket, in
} else
return 0;
- int ret = write_socket(socket, timeout_millis, time, buf2, size);
+ int ret = write_socket(socket, timeout_millis, time, buf2, (int)size);
if(buf2 != buf)
free(buf2);
return ret;
@@ -254,7 +254,7 @@ vprintln_socket(NDB_SOCKET_TYPE socket,
}
buf2[size-1]='\n';
- int ret = write_socket(socket, timeout_millis, time, buf2, size);
+ int ret = write_socket(socket, timeout_millis, time, buf2, (int)size);
if(buf2 != buf)
free(buf2);
return ret;
=== modified file 'storage/ndb/src/cw/cpcd/APIService.cpp'
--- a/storage/ndb/src/cw/cpcd/APIService.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/cw/cpcd/APIService.cpp 2011-10-21 08:59:23 +0000
@@ -182,7 +182,7 @@ CPCDAPISession::runSession(){
switch(ctx.m_status){
case Parser_t::Ok:
- for(size_t i = 0; i<ctx.m_aliasUsed.size(); i++)
+ for(unsigned i = 0; i<ctx.m_aliasUsed.size(); i++)
ndbout_c("Used alias: %s -> %s",
ctx.m_aliasUsed[i]->name, ctx.m_aliasUsed[i]->realName);
break;
@@ -199,7 +199,7 @@ CPCDAPISession::runSession(){
void
CPCDAPISession::stopSession(){
CPCD::RequestStatus rs;
- for(size_t i = 0; i<m_temporaryProcesses.size(); i++){
+ for(unsigned i = 0; i<m_temporaryProcesses.size(); i++){
Uint32 id = m_temporaryProcesses[i];
m_cpcd.undefineProcess(&rs, id);
}
@@ -215,7 +215,7 @@ CPCDAPISession::loadFile(){
switch(ctx.m_status){
case Parser_t::Ok:
- for(size_t i = 0; i<ctx.m_aliasUsed.size(); i++)
+ for(unsigned i = 0; i<ctx.m_aliasUsed.size(); i++)
ndbout_c("Used alias: %s -> %s",
ctx.m_aliasUsed[i]->name, ctx.m_aliasUsed[i]->realName);
break;
@@ -348,7 +348,7 @@ CPCDAPISession::listProcesses(Parser_t::
m_output->println("%s", "");
- for(size_t i = 0; i < proclist->size(); i++) {
+ for(unsigned i = 0; i < proclist->size(); i++) {
CPCD::Process *p = (*proclist)[i];
m_output->println("process");
=== modified file 'storage/ndb/src/cw/cpcd/CPCD.cpp'
--- a/storage/ndb/src/cw/cpcd/CPCD.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/cw/cpcd/CPCD.cpp 2011-10-21 08:59:23 +0000
@@ -60,7 +60,7 @@ CPCD::findUniqueId() {
if(id == 0)
ok = false;
- for(size_t i = 0; i<m_processes.size(); i++) {
+ for(unsigned i = 0; i<m_processes.size(); i++) {
if(m_processes[i]->m_id == id)
ok = false;
}
@@ -76,7 +76,7 @@ CPCD::defineProcess(RequestStatus * rs,
Guard tmp(m_processes);
- for(size_t i = 0; i<m_processes.size(); i++) {
+ for(unsigned i = 0; i<m_processes.size(); i++) {
Process * proc = m_processes[i];
if((strcmp(arg->m_name.c_str(), proc->m_name.c_str()) == 0) &&
@@ -106,7 +106,7 @@ CPCD::undefineProcess(CPCD::RequestStatu
Guard tmp(m_processes);
Process * proc = 0;
- size_t i;
+ unsigned i;
for(i = 0; i < m_processes.size(); i++) {
if(m_processes[i]->m_id == id) {
proc = m_processes[i];
@@ -142,7 +142,7 @@ CPCD::startProcess(CPCD::RequestStatus *
Guard tmp(m_processes);
- for(size_t i = 0; i < m_processes.size(); i++) {
+ for(unsigned i = 0; i < m_processes.size(); i++) {
if(m_processes[i]->m_id == id) {
proc = m_processes[i];
break;
@@ -185,7 +185,7 @@ CPCD::stopProcess(CPCD::RequestStatus *r
Guard tmp(m_processes);
Process * proc = 0;
- for(size_t i = 0; i < m_processes.size(); i++) {
+ for(unsigned i = 0; i < m_processes.size(); i++) {
if(m_processes[i]->m_id == id) {
proc = m_processes[i];
break;
@@ -264,7 +264,7 @@ CPCD::saveProcessList(){
return false;
}
- for(size_t i = 0; i<m_processes.size(); i++){
+ for(unsigned i = 0; i<m_processes.size(); i++){
m_processes[i]->print(f);
fprintf(f, "\n");
@@ -367,7 +367,7 @@ CPCD::loadProcessList(){
sess.loadFile();
loadingProcessList = false;
- size_t i;
+ unsigned i;
Vector<int> temporary;
for(i = 0; i<m_processes.size(); i++){
Process * proc = m_processes[i];
=== modified file 'storage/ndb/src/cw/cpcd/Monitor.cpp'
--- a/storage/ndb/src/cw/cpcd/Monitor.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/cw/cpcd/Monitor.cpp 2011-10-21 08:59:23 +0000
@@ -63,7 +63,7 @@ CPCD::Monitor::run() {
proc.lock();
- for(size_t i = 0; i < proc.size(); i++) {
+ for(unsigned i = 0; i < proc.size(); i++) {
proc[i]->monitor();
}
=== modified file 'storage/ndb/src/cw/cpcd/Process.cpp'
--- a/storage/ndb/src/cw/cpcd/Process.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/cw/cpcd/Process.cpp 2011-10-21 08:59:23 +0000
@@ -334,7 +334,7 @@ save_environment(const char *env, Vector
void
CPCD::Process::do_exec() {
- size_t i;
+ unsigned i;
#ifdef _WIN32
Vector<BaseString> saved;
@@ -411,7 +411,7 @@ CPCD::Process::do_exec() {
}
int f = fds[i]= open(redirects[i]->c_str(), flags, mode);
if(f == -1){
- logger.error("Cannot redirect %ld to/from '%s' : %s\n", i,
+ logger.error("Cannot redirect %u to/from '%s' : %s\n", i,
redirects[i]->c_str(), strerror(errno));
_exit(1);
}
=== modified file 'storage/ndb/src/kernel/blocks/backup/read.cpp'
--- a/storage/ndb/src/kernel/blocks/backup/read.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/read.cpp 2011-10-21 08:59:23 +0000
@@ -229,7 +229,7 @@ size_t
aread(void * buf, size_t sz, size_t n, ndbzio_stream* f)
{
int error = 0;
- unsigned r = ndbzread(f, buf, (sz * n), &error);
+ unsigned r = ndbzread(f, buf, (unsigned)(sz * n), &error);
if (error || r != (sz * n))
{
printf("Failed to read!!");
=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2011-10-17 13:37:47 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2011-10-21 08:59:23 +0000
@@ -15406,7 +15406,7 @@ Dbdict::createEvent_RT_USER_CREATE(Signa
}
r0.getString(evntRecPtr.p->m_eventRec.NAME);
{
- int len = strlen(evntRecPtr.p->m_eventRec.NAME);
+ int len = (int)strlen(evntRecPtr.p->m_eventRec.NAME);
memset(evntRecPtr.p->m_eventRec.NAME+len, 0, MAX_TAB_NAME_SIZE-len);
#ifdef EVENT_DEBUG
printf("CreateEvntReq::RT_USER_CREATE; EventName %s, len %u\n",
@@ -15434,7 +15434,7 @@ sendref:
}
r0.getString(evntRecPtr.p->m_eventRec.TABLE_NAME);
{
- int len = strlen(evntRecPtr.p->m_eventRec.TABLE_NAME);
+ int len = (int)strlen(evntRecPtr.p->m_eventRec.TABLE_NAME);
memset(evntRecPtr.p->m_eventRec.TABLE_NAME+len, 0, MAX_TAB_NAME_SIZE-len);
}
@@ -16059,7 +16059,7 @@ Dbdict::createEvent_RT_USER_GET(Signal*
}
r0.getString(evntRecPtr.p->m_eventRec.NAME);
- int len = strlen(evntRecPtr.p->m_eventRec.NAME);
+ int len = (int)strlen(evntRecPtr.p->m_eventRec.NAME);
memset(evntRecPtr.p->m_eventRec.NAME+len, 0, MAX_TAB_NAME_SIZE-len);
releaseSections(handle);
@@ -17122,7 +17122,7 @@ Dbdict::execDROP_EVNT_REQ(Signal* signal
}
r0.getString(evntRecPtr.p->m_eventRec.NAME);
{
- int len = strlen(evntRecPtr.p->m_eventRec.NAME);
+ int len = (int)strlen(evntRecPtr.p->m_eventRec.NAME);
memset(evntRecPtr.p->m_eventRec.NAME+len, 0, MAX_TAB_NAME_SIZE-len);
#ifdef EVENT_DEBUG
printf("DropEvntReq; EventName %s, len %u\n",
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp 2011-10-21 08:59:23 +0000
@@ -58,7 +58,7 @@ char * getNSString(Uint32 ns){
void
fill(const char * buf, int mod){
- int len = strlen(buf)+1;
+ int len = (int)(strlen(buf)+1);
ndbout << buf << " ";
while((len % mod) != 0){
ndbout << " ";
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp 2011-10-21 08:59:23 +0000
@@ -85,7 +85,7 @@ NDB_COMMAND(redoLogFileReader, "redoLog
{
MY_STAT buf;
my_stat(fileName, &buf, MYF(0));
- NO_MBYTE_IN_FILE = buf.st_size / (1024 * 1024);
+ NO_MBYTE_IN_FILE = (unsigned)(buf.st_size / (1024 * 1024));
if (NO_MBYTE_IN_FILE != 16)
{
ndbout_c("Detected %umb files", NO_MBYTE_IN_FILE);
=== modified file 'storage/ndb/src/kernel/error/ErrorReporter.cpp'
--- a/storage/ndb/src/kernel/error/ErrorReporter.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/kernel/error/ErrorReporter.cpp 2011-10-21 08:59:23 +0000
@@ -163,7 +163,7 @@ ErrorReporter::formatMessage(int thr_no,
{
for (Uint32 i = 1 ; i < num_threads; i++)
{
- sofar = strlen(messptr);
+ sofar = (int)strlen(messptr);
if(sofar < MESSAGE_LENGTH)
{
BaseString::snprintf(messptr + sofar, MESSAGE_LENGTH - sofar,
@@ -172,7 +172,7 @@ ErrorReporter::formatMessage(int thr_no,
}
}
- sofar = strlen(messptr);
+ sofar = (int)strlen(messptr);
if(sofar < MESSAGE_LENGTH)
{
BaseString::snprintf(messptr + sofar, MESSAGE_LENGTH - sofar,
=== modified file 'storage/ndb/src/mgmapi/mgmapi.cpp'
--- a/storage/ndb/src/mgmapi/mgmapi.cpp 2011-09-19 11:59:09 +0000
+++ b/storage/ndb/src/mgmapi/mgmapi.cpp 2011-10-21 08:59:23 +0000
@@ -2039,7 +2039,7 @@ ndb_mgm_dump_state(NdbMgmHandle handle,
char buf[256];
buf[0] = 0;
for (int i = 0; i < _num_args; i++){
- unsigned n = strlen(buf);
+ unsigned n = (unsigned)strlen(buf);
if (n + 20 > sizeof(buf)) {
SET_ERROR(handle, NDB_MGM_USAGE_ERROR, "arguments too long");
DBUG_RETURN(-1);
@@ -2562,7 +2562,7 @@ ndb_mgm_get_configuration2(NdbMgmHandle
size_t start = 0;
do {
if((read = read_socket(handle->socket, handle->timeout,
- &buf64[start], len-start)) < 1){
+ &buf64[start], (int)(len-start))) < 1){
delete[] buf64;
buf64 = 0;
if(read==0)
=== modified file 'storage/ndb/src/mgmclient/CommandInterpreter.cpp'
--- a/storage/ndb/src/mgmclient/CommandInterpreter.cpp 2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp 2011-10-21 08:59:23 +0000
@@ -1154,7 +1154,7 @@ CommandInterpreter::execute_impl(const c
}
// for mysql client compatability remove trailing ';'
{
- unsigned last= strlen(line)-1;
+ unsigned last= (unsigned)(strlen(line)-1);
if (line[last] == ';')
{
line[last]= 0;
@@ -2431,7 +2431,7 @@ CommandInterpreter::executeDumpState(int
return -1;
}
- for (size_t i = 0; i < args.size(); i++)
+ for (unsigned i = 0; i < args.size(); i++)
{
const char* arg = args[i].c_str();
=== modified file 'storage/ndb/src/mgmsrv/InitConfigFileParser.cpp'
--- a/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp 2011-10-21 08:59:23 +0000
@@ -186,7 +186,7 @@ InitConfigFileParser::run_config_rules(C
ConfigInfo::m_ConfigRules[i].m_ruleData))
return 0;
- for(size_t j = 0; j<tmp.size(); j++){
+ for(unsigned j = 0; j<tmp.size(); j++){
BaseString::snprintf(ctx.fname, sizeof(ctx.fname),
"%s", tmp[j].m_sectionType.c_str());
ctx.type = InitConfigFileParser::Section;
@@ -478,7 +478,7 @@ bool InitConfigFileParser::convertString
//****************************************************************************
static void
trim(char * str){
- int len = strlen(str);
+ int len = (int)strlen(str);
for(len--;
(str[len] == '\r' || str[len] == '\n' ||
str[len] == ' ' || str[len] == '\t') &&
@@ -581,7 +581,7 @@ bool
InitConfigFileParser::storeSection(Context& ctx){
if(ctx.m_currentSection == NULL)
return true;
- for(int i = strlen(ctx.fname) - 1; i>=0; i--){
+ for(int i = (int)strlen(ctx.fname) - 1; i>=0; i--){
ctx.fname[i] = toupper(ctx.fname[i]);
}
BaseString::snprintf(ctx.pname, sizeof(ctx.pname), "%s", ctx.fname);
=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2011-09-27 07:35:34 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp 2011-10-21 08:59:23 +0000
@@ -3576,7 +3576,7 @@ MgmtSrvr::alloc_node_id_impl(NodeId& nod
return false;
// Print list of possible nodes
- for (size_t i = 0; i < nodes.size(); i++)
+ for (unsigned i = 0; i < nodes.size(); i++)
{
const PossibleNode& node = nodes[i];
g_eventLogger->debug(" [%u]: %u, '%s', %d",
=== modified file 'storage/ndb/src/mgmsrv/Services.cpp'
--- a/storage/ndb/src/mgmsrv/Services.cpp 2011-09-13 09:10:52 +0000
+++ b/storage/ndb/src/mgmsrv/Services.cpp 2011-10-21 08:59:23 +0000
@@ -1370,12 +1370,12 @@ logevent2str(BaseString& str, int eventT
str.appfmt("%s=%d\n",ndb_logevent_body[i].token, val);
if(strcmp(ndb_logevent_body[i].token,"error") == 0)
{
- int pretty_text_len= strlen(pretty_text);
+ int pretty_text_len= (int)strlen(pretty_text);
if(pretty_text_size-pretty_text_len-3 > 0)
{
BaseString::snprintf(pretty_text+pretty_text_len, 4 , " - ");
ndb_error_string(val, pretty_text+(pretty_text_len+3),
- pretty_text_size-pretty_text_len-3);
+ (int)(pretty_text_size-pretty_text_len-3));
}
}
} while (ndb_logevent_body[++i].type == eventType);
@@ -1631,7 +1631,7 @@ MgmApiSession::listen_event(Parser<MgmAp
Vector<BaseString> list;
param.trim();
param.split(list, " ,");
- for(size_t i = 0; i<list.size(); i++){
+ for(unsigned i = 0; i<list.size(); i++){
Vector<BaseString> spec;
list[i].trim();
list[i].split(spec, "=:");
@@ -1852,7 +1852,7 @@ MgmApiSession::list_session(SocketServer
lister->m_output->println("session.%llu.m_stop: %d",id,s->m_stop);
if(s->m_ctx)
{
- int l= strlen(s->m_ctx->m_tokenBuffer);
+ int l= (int)strlen(s->m_ctx->m_tokenBuffer);
char *buf= (char*) malloc(2*l+1);
char *b= buf;
for(int i=0; i<l;i++)
@@ -1922,7 +1922,7 @@ MgmApiSession::get_session(SocketServer:
p->l->m_output->println("m_stop: %d",s->m_stop);
if(s->m_ctx)
{
- int l= strlen(s->m_ctx->m_tokenBuffer);
+ int l= (int)strlen(s->m_ctx->m_tokenBuffer);
p->l->m_output->println("parser_buffer_len: %u",l);
p->l->m_output->println("parser_status: %d",s->m_ctx->m_status);
}
@@ -2019,7 +2019,7 @@ void MgmApiSession::setConfig(Parser_t::
if((r= read_socket(m_socket,
SOCKET_TIMEOUT,
&buf64[start],
- len64-start)) < 1)
+ (int)(len64-start))) < 1)
{
delete[] buf64;
result.assfmt("read_socket failed, errno: %d", errno);
=== modified file 'storage/ndb/src/ndbapi/NdbBlob.cpp'
--- a/storage/ndb/src/ndbapi/NdbBlob.cpp 2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/ndbapi/NdbBlob.cpp 2011-10-21 08:59:23 +0000
@@ -696,7 +696,7 @@ NdbBlob::copyKeyFromRow(const NdbRecord
unpacked+= unpacked_len;
}
- packedBuf.size= packed - packedBuf.data;
+ packedBuf.size= (Uint32)(packed - packedBuf.data);
packedBuf.zerorest();
assert(unpacked == unpackedBuf.data + unpackedBuf.size);
DBUG_RETURN(0);
=== modified file 'storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp 2011-06-06 12:18:27 +0000
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp 2011-10-21 08:59:23 +0000
@@ -1260,7 +1260,7 @@ NdbTableImpl::buildColumnHash(){
Uint32 bucket = hv & m_columnHashMask;
bucket = (bucket < size ? bucket : bucket - size);
m_columnHash[bucket] = (sz << 16) | (((size - bucket) + pos) << 1);
- for(size_t j = 0; j<sz; j++, pos++){
+ for(unsigned j = 0; j<sz; j++, pos++){
Uint32 col = chains[i][j];
Uint32 hv = hashValues[col];
if (m_columnHash.push_back((col << 16) | hv))
=== modified file 'storage/ndb/test/ndbapi/ScanFunctions.hpp'
--- a/storage/ndb/test/ndbapi/ScanFunctions.hpp 2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/ndbapi/ScanFunctions.hpp 2011-10-21 08:59:23 +0000
@@ -29,7 +29,7 @@ class AttribList {
public:
AttribList(){};
~AttribList(){
- for(size_t i = 0; i < attriblist.size(); i++){
+ for(unsigned i = 0; i < attriblist.size(); i++){
delete attriblist[i];
}
};
@@ -335,7 +335,7 @@ void AttribList::buildAttribList(const N
attriblist.push_back(attr);
#if 1
- for(size_t j = 0; j < attriblist.size(); j++){
+ for(unsigned j = 0; j < attriblist.size(); j++){
g_info << attriblist[j]->numAttribs << ": " ;
for(int a = 0; a < attriblist[j]->numAttribs; a++)
=== modified file 'storage/ndb/test/src/DbUtil.cpp'
--- a/storage/ndb/test/src/DbUtil.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/src/DbUtil.cpp 2011-10-21 08:59:23 +0000
@@ -215,7 +215,7 @@ DbUtil::mysqlSimplePrepare(const char *q
printf("Inside DbUtil::mysqlSimplePrepare\n");
#endif
MYSQL_STMT *my_stmt= mysql_stmt_init(this->getMysql());
- if (my_stmt && mysql_stmt_prepare(my_stmt, query, strlen(query))){
+ if (my_stmt && mysql_stmt_prepare(my_stmt, query, (unsigned long)strlen(query))){
this->printStError(my_stmt,"Prepare Statement Failed");
mysql_stmt_close(my_stmt);
return NULL;
@@ -353,7 +353,7 @@ DbUtil::runQuery(const char* sql,
MYSQL_STMT *stmt= mysql_stmt_init(m_mysql);
- if (mysql_stmt_prepare(stmt, sql, strlen(sql)))
+ if (mysql_stmt_prepare(stmt, sql, (unsigned long)strlen(sql)))
{
report_error("Failed to prepare: ", m_mysql);
return false;
@@ -390,7 +390,7 @@ DbUtil::runQuery(const char* sql,
args.get(name.c_str(), &val_s);
bind_param[i].buffer_type= MYSQL_TYPE_STRING;
bind_param[i].buffer= (char*)val_s;
- bind_param[i].buffer_length= strlen(val_s);
+ bind_param[i].buffer_length= (unsigned long)strlen(val_s);
g_debug << " param" << name.c_str() << ": " << val_s << endl;
break;
default:
=== modified file 'storage/ndb/test/src/HugoQueries.cpp'
--- a/storage/ndb/test/src/HugoQueries.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/src/HugoQueries.cpp 2011-10-21 08:59:23 +0000
@@ -41,7 +41,7 @@ HugoQueries::HugoQueries(const NdbQueryD
HugoQueries::~HugoQueries()
{
- for (size_t o = 0; o<m_ops.size(); o++)
+ for (unsigned o = 0; o<m_ops.size(); o++)
{
while (m_ops[o].m_rows.size())
{
@@ -56,14 +56,14 @@ HugoQueries::~HugoQueries()
void
HugoQueries::allocRows(int batch)
{
- for (size_t o = 0; o<m_ops.size(); o++)
+ for (unsigned o = 0; o<m_ops.size(); o++)
{
const NdbQueryOperationDef * pOp =m_query_def->getQueryOperation((Uint32)o);
const NdbDictionary::Table* tab = pOp->getTable();
if (tab)
{
- while (m_ops[o].m_rows.size() < (size_t)batch)
+ while (m_ops[o].m_rows.size() < (unsigned)batch)
{
m_ops[o].m_rows.push_back(new NDBT_ResultRow(* tab));
}
@@ -197,7 +197,7 @@ HugoQueries::runLookupQuery(Ndb* pNdb,
return NDBT_FAILED;
}
- for (size_t o = 0; o<m_ops.size(); o++)
+ for (unsigned o = 0; o<m_ops.size(); o++)
{
NdbQueryOperation * pOp = query->getQueryOperation((Uint32)o);
HugoQueries::getValueForQueryOp(pOp, m_ops[o].m_rows[b]);
@@ -225,7 +225,7 @@ HugoQueries::runLookupQuery(Ndb* pNdb,
NdbQuery * query = queries[b];
if (query->nextResult() == NdbQuery::NextResult_gotRow)
{
- for (size_t o = 0; o<m_ops.size(); o++)
+ for (unsigned o = 0; o<m_ops.size(); o++)
{
NdbQueryOperation * pOp = query->getQueryOperation((Uint32)o);
if (!pOp->isRowNULL())
@@ -243,7 +243,7 @@ HugoQueries::runLookupQuery(Ndb* pNdb,
pTrans->close();
r += batch;
- for (size_t i = 0; i<batch_rows_found.size(); i++)
+ for (unsigned i = 0; i<batch_rows_found.size(); i++)
m_rows_found[i] += batch_rows_found[i];
}
@@ -292,7 +292,7 @@ HugoQueries::runScanQuery(Ndb * pNdb,
return NDBT_FAILED;
}
- for (size_t o = 0; o<m_ops.size(); o++)
+ for (unsigned o = 0; o<m_ops.size(); o++)
{
NdbQueryOperation * pOp = query->getQueryOperation((Uint32)o);
HugoQueries::getValueForQueryOp(pOp, m_ops[o].m_rows[0]);
@@ -335,7 +335,7 @@ HugoQueries::runScanQuery(Ndb * pNdb,
return NDBT_OK;
}
- for (size_t o = 0; o<m_ops.size(); o++)
+ for (unsigned o = 0; o<m_ops.size(); o++)
{
NdbQueryOperation * pOp = query->getQueryOperation((Uint32)o);
if (!pOp->isRowNULL())
=== modified file 'storage/ndb/test/src/HugoQueryBuilder.cpp'
--- a/storage/ndb/test/src/HugoQueryBuilder.cpp 2011-07-04 13:37:56 +0000
+++ b/storage/ndb/test/src/HugoQueryBuilder.cpp 2011-10-21 08:59:23 +0000
@@ -55,7 +55,7 @@ HugoQueryBuilder::init()
HugoQueryBuilder::~HugoQueryBuilder()
{
- for (size_t i = 0; i<m_queries.size(); i++)
+ for (unsigned i = 0; i<m_queries.size(); i++)
m_queries[i]->destroy();
}
@@ -76,7 +76,7 @@ HugoQueryBuilder::fixOptions()
void
HugoQueryBuilder::addTable(Ndb* ndb, const NdbDictionary::Table* tab)
{
- for (size_t i = 0; i<m_tables.size(); i++)
+ for (unsigned i = 0; i<m_tables.size(); i++)
{
if (m_tables[i].m_table == tab)
return;
@@ -133,7 +133,7 @@ HugoQueryBuilder::getJoinLevel() const
void
HugoQueryBuilder::removeTable(const NdbDictionary::Table* tab)
{
- for (size_t i = 0; i<m_tables.size(); i++)
+ for (unsigned i = 0; i<m_tables.size(); i++)
{
if (m_tables[i].m_table == tab)
{
@@ -215,11 +215,11 @@ HugoQueryBuilder::checkBindable(Vector<c
Vector<Op> ops,
bool allow_bind_nullable)
{
- for (size_t c = 0; c < cols.size(); c++)
+ for (unsigned c = 0; c < cols.size(); c++)
{
const NdbDictionary::Column * col = cols[c];
bool found = false;
- for (size_t t = 0; !found && t<ops.size(); t++)
+ for (unsigned t = 0; !found && t<ops.size(); t++)
{
const NdbDictionary::Table * tab = ops[t].m_op->getTable();
if (tab)
@@ -274,7 +274,7 @@ HugoQueryBuilder::checkBusyScan(Op op) c
op = m_query[op.m_parent];
}
- for (size_t i = op.m_idx + 1; i < m_query.size(); i++)
+ for (unsigned i = op.m_idx + 1; i < m_query.size(); i++)
if (isAncestor(op, m_query[i]) && isScan(m_query[i].m_op))
return true;
@@ -537,11 +537,11 @@ loop:
if (op.m_op == 0)
{
ndbout << "Failed to add to " << endl;
- for (size_t i = 0; i<m_query.size(); i++)
+ for (unsigned i = 0; i<m_query.size(); i++)
ndbout << m_query[i] << endl;
ndbout << "Parents: " << endl;
- for (size_t i = 0; i<parents.size(); i++)
+ for (unsigned i = 0; i<parents.size(); i++)
ndbout << parents[i].m_idx << " ";
ndbout << endl;
}
=== modified file 'storage/ndb/test/src/NDBT_Test.cpp'
--- a/storage/ndb/test/src/NDBT_Test.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/src/NDBT_Test.cpp 2011-10-21 08:59:23 +0000
@@ -414,7 +414,7 @@ NDBT_TestCaseImpl1::NDBT_TestCaseImpl1(N
NDBT_TestCaseImpl1::~NDBT_TestCaseImpl1(){
NdbCondition_Destroy(waitThreadsCondPtr);
NdbMutex_Destroy(waitThreadsMutexPtr);
- size_t i;
+ unsigned i;
for(i = 0; i < initializers.size(); i++)
delete initializers[i];
initializers.clear();
=== modified file 'storage/ndb/test/src/NdbBackup.cpp'
--- a/storage/ndb/test/src/NdbBackup.cpp 2011-07-04 13:37:56 +0000
+++ b/storage/ndb/test/src/NdbBackup.cpp 2011-10-21 08:59:23 +0000
@@ -308,7 +308,7 @@ NdbBackup::restore(unsigned _backup_id){
res = execRestore(true, true, ndbNodes[0].node_id, _backup_id);
// Restore data once for each node
- for(size_t i = 1; i < ndbNodes.size(); i++){
+ for(unsigned i = 1; i < ndbNodes.size(); i++){
res = execRestore(true, false, ndbNodes[i].node_id, _backup_id);
}
=== modified file 'storage/ndb/test/src/NdbRestarter.cpp'
--- a/storage/ndb/test/src/NdbRestarter.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/src/NdbRestarter.cpp 2011-10-21 08:59:23 +0000
@@ -59,7 +59,7 @@ int NdbRestarter::getDbNodeId(int _i){
if (getStatus() != 0)
return -1;
- for(size_t i = 0; i < ndbNodes.size(); i++){
+ for(unsigned i = 0; i < ndbNodes.size(); i++){
if (i == (unsigned)_i){
return ndbNodes[i].node_id;
}
@@ -114,7 +114,7 @@ NdbRestarter::restartNodes(int * nodes,
for (int j = 0; j<cnt; j++)
{
int _nodeId = nodes[j];
- for(size_t i = 0; i < ndbNodes.size(); i++)
+ for(unsigned i = 0; i < ndbNodes.size(); i++)
{
if(ndbNodes[i].node_id == _nodeId)
{
@@ -147,7 +147,7 @@ NdbRestarter::getMasterNodeId(){
int min = 0;
int node = -1;
- for(size_t i = 0; i < ndbNodes.size(); i++){
+ for(unsigned i = 0; i < ndbNodes.size(); i++){
if(min == 0 || ndbNodes[i].dynamic_id < min){
min = ndbNodes[i].dynamic_id;
node = ndbNodes[i].node_id;
@@ -165,7 +165,7 @@ NdbRestarter::getNodeGroup(int nodeId){
if (getStatus() != 0)
return -1;
- for(size_t i = 0; i < ndbNodes.size(); i++)
+ for(unsigned i = 0; i < ndbNodes.size(); i++)
{
if(ndbNodes[i].node_id == nodeId)
{
@@ -184,7 +184,7 @@ NdbRestarter::getNextMasterNodeId(int no
if (getStatus() != 0)
return -1;
- size_t i;
+ unsigned i;
for(i = 0; i < ndbNodes.size(); i++)
{
if(ndbNodes[i].node_id == nodeId)
@@ -244,7 +244,7 @@ NdbRestarter::getRandomNodeOtherNodeGrou
return -1;
int node_group = -1;
- for(size_t i = 0; i < ndbNodes.size(); i++){
+ for(unsigned i = 0; i < ndbNodes.size(); i++){
if(ndbNodes[i].node_id == nodeId){
node_group = ndbNodes[i].node_group;
break;
@@ -274,7 +274,7 @@ NdbRestarter::getRandomNodeSameNodeGroup
return -1;
int node_group = -1;
- for(size_t i = 0; i < ndbNodes.size(); i++){
+ for(unsigned i = 0; i < ndbNodes.size(); i++){
if(ndbNodes[i].node_id == nodeId){
node_group = ndbNodes[i].node_group;
break;
@@ -347,7 +347,7 @@ NdbRestarter::waitClusterState(ndb_mgm_n
}
// Collect all nodes into nodes
- for (size_t i = 0; i < ndbNodes.size(); i++){
+ for (unsigned i = 0; i < ndbNodes.size(); i++){
nodes[i] = ndbNodes[i].node_id;
numNodes++;
}
@@ -388,7 +388,7 @@ NdbRestarter::waitNodesState(const int *
* First check if any node is not starting
* then it's no idea to wait anymore
*/
- for (size_t n = 0; n < ndbNodes.size(); n++){
+ for (unsigned n = 0; n < ndbNodes.size(); n++){
if (ndbNodes[n].node_status != NDB_MGM_NODE_STATUS_STARTED &&
ndbNodes[n].node_status != NDB_MGM_NODE_STATUS_STARTING)
waitMore = false;
@@ -426,7 +426,7 @@ NdbRestarter::waitNodesState(const int *
for (int i = 0; i < _num_nodes; i++){
ndb_mgm_node_state* ndbNode = NULL;
- for (size_t n = 0; n < ndbNodes.size(); n++){
+ for (unsigned n = 0; n < ndbNodes.size(); n++){
if (ndbNodes[n].node_id == _nodes[i])
ndbNode = &ndbNodes[n];
}
@@ -713,7 +713,7 @@ int NdbRestarter::insertErrorInAllNodes(
int result = 0;
- for(size_t i = 0; i < ndbNodes.size(); i++){
+ for(unsigned i = 0; i < ndbNodes.size(); i++){
g_debug << "inserting error in node " << ndbNodes[i].node_id << endl;
if (insertErrorInNode(ndbNodes[i].node_id, _error) == -1)
result = -1;
@@ -751,7 +751,7 @@ int NdbRestarter::dumpStateAllNodes(cons
int result = 0;
- for(size_t i = 0; i < ndbNodes.size(); i++){
+ for(unsigned i = 0; i < ndbNodes.size(); i++){
g_debug << "dumping state in node " << ndbNodes[i].node_id << endl;
if (dumpStateOneNode(ndbNodes[i].node_id, _args, _num_args) == -1)
result = -1;
@@ -841,7 +841,7 @@ NdbRestarter::checkClusterAlive(const in
for (int i = 0; i<num_nodes; i++)
mask.set(deadnodes[i]);
- for (size_t n = 0; n < ndbNodes.size(); n++)
+ for (unsigned n = 0; n < ndbNodes.size(); n++)
{
if (mask.get(ndbNodes[n].node_id))
continue;
@@ -862,7 +862,7 @@ NdbRestarter::rollingRestart(Uint32 flag
NdbNodeBitmask ng_mask;
NdbNodeBitmask restart_nodes;
Vector<int> nodes;
- for(size_t i = 0; i < ndbNodes.size(); i++)
+ for(unsigned i = 0; i < ndbNodes.size(); i++)
{
if (ng_mask.get(ndbNodes[i].node_group) == false)
{
@@ -911,7 +911,7 @@ NdbRestarter::getMasterNodeVersion(int&
int masterNodeId = getMasterNodeId();
if (masterNodeId != -1)
{
- for(size_t i = 0; i < ndbNodes.size(); i++)
+ for(unsigned i = 0; i < ndbNodes.size(); i++)
{
if (ndbNodes[i].node_id == masterNodeId)
{
@@ -964,7 +964,7 @@ NdbRestarter::getNodeTypeVersionRange(nd
minVer = 0;
maxVer = 0;
- for(size_t i = 0; i < nodeVec->size(); i++)
+ for(unsigned i = 0; i < nodeVec->size(); i++)
{
int nodeVer = (*nodeVec)[i].version;
if ((minVer == 0) ||
@@ -984,7 +984,7 @@ NdbRestarter::getNodeStatus(int nodeid)
if (getStatus() != 0)
return -1;
- for (size_t n = 0; n < ndbNodes.size(); n++)
+ for (unsigned n = 0; n < ndbNodes.size(); n++)
{
if (ndbNodes[n].node_id == nodeid)
return ndbNodes[n].node_status;
=== modified file 'storage/ndb/test/src/getarg.c'
--- a/storage/ndb/test/src/getarg.c 2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/src/getarg.c 2011-10-21 08:59:23 +0000
@@ -290,7 +290,7 @@ arg_printusage (struct getargs *args,
strlcat(buf, "]", sizeof(buf));
if(args[i].type == arg_strings)
strlcat(buf, "...", sizeof(buf));
- col = check_column(stderr, col, strlen(buf) + 1, columns);
+ col = check_column(stderr, col, (int)strlen(buf) + 1, columns);
col += fprintf(stderr, " %s", buf);
}
if (args[i].short_name) {
@@ -301,7 +301,7 @@ arg_printusage (struct getargs *args,
strlcat(buf, "]", sizeof(buf));
if(args[i].type == arg_strings)
strlcat(buf, "...", sizeof(buf));
- col = check_column(stderr, col, strlen(buf) + 1, columns);
+ col = check_column(stderr, col, (int)strlen(buf) + 1, columns);
col += fprintf(stderr, " %s", buf);
}
if (args[i].long_name && args[i].short_name)
@@ -309,7 +309,7 @@ arg_printusage (struct getargs *args,
max_len = max(max_len, len);
}
if (extra_string) {
- col = check_column(stderr, col, strlen(extra_string) + 1, columns);
+ col = check_column(stderr, col, (int)strlen(extra_string) + 1, columns);
fprintf (stderr, " %s\n", extra_string);
} else
fprintf (stderr, "\n");
@@ -360,14 +360,14 @@ arg_match_long(struct getargs *args, siz
int argv_len;
char *p;
- argv_len = strlen(argv);
+ argv_len = (int)strlen(argv);
p = strchr (argv, '=');
if (p != NULL)
- argv_len = p - argv;
+ argv_len = (int)(p - argv);
for (i = 0; i < num_args; ++i) {
if(args[i].long_name) {
- int len = strlen(args[i].long_name);
+ int len = (int)strlen(args[i].long_name);
char *p = argv;
int p_len = argv_len;
negate = 0;
@@ -467,7 +467,7 @@ arg_match_long(struct getargs *args, siz
}
case arg_collect:{
struct getarg_collect_info *c = current->value;
- int o = argv - rargv[*optind];
+ int o = (int)(argv - rargv[*optind]);
return (*c->func)(FALSE, argc, rargv, optind, &o, c->data);
}
=== modified file 'storage/ndb/test/tools/cpcc.cpp'
--- a/storage/ndb/test/tools/cpcc.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/tools/cpcc.cpp 2011-10-21 08:59:23 +0000
@@ -140,7 +140,7 @@ public:
virtual bool evaluate(SimpleCpcClient* c, const SimpleCpcClient::Process & p){
bool run = on_empty;
- for(size_t i = 0; i<m_cond.size(); i++){
+ for(unsigned i = 0; i<m_cond.size(); i++){
if(m_cond[i]->evaluate(c, p)){
run = true;
break;
@@ -172,7 +172,7 @@ void
add_hosts(Vector<SimpleCpcClient*> & hosts, BaseString list){
Vector<BaseString> split;
list.split(split);
- for(size_t i = 0; i<split.size(); i++){
+ for(unsigned i = 0; i<split.size(); i++){
add_host(hosts, split[i]);
}
}
@@ -273,7 +273,7 @@ main(int argc, const char** argv){
int
connect(Vector<SimpleCpcClient*>& list){
- for(size_t i = 0; i<list.size(); i++){
+ for(unsigned i = 0; i<list.size(); i++){
if(list[i]->connect() != 0){
ndbout_c("Failed to connect to %s:%d",
list[i]->getHost(), list[i]->getPort());
@@ -285,7 +285,7 @@ connect(Vector<SimpleCpcClient*>& list){
int
for_each(Vector<SimpleCpcClient*>& list, Expression & expr){
- for(size_t i = 0; i<list.size(); i++){
+ for(unsigned i = 0; i<list.size(); i++){
if(list[i] == 0)
continue;
Properties p;
@@ -294,7 +294,7 @@ for_each(Vector<SimpleCpcClient*>& list,
ndbout << "Failed to list processes on "
<< list[i]->getHost() << ":" << list[i]->getPort() << endl;
}
- for(size_t j = 0; j<procs.size(); j++)
+ for(unsigned j = 0; j<procs.size(); j++)
expr.evaluate(list[i], procs[j]);
}
return 0;
=== modified file 'storage/ndb/tools/restore/consumer_restore.cpp'
--- a/storage/ndb/tools/restore/consumer_restore.cpp 2011-06-30 15:59:25 +0000
+++ b/storage/ndb/tools/restore/consumer_restore.cpp 2011-10-21 08:59:23 +0000
@@ -679,7 +679,7 @@ BackupRestore::rebuild_indexes(const Tab
NdbDictionary::Dictionary* dict = m_ndb->getDictionary();
Vector<NdbDictionary::Index*> & indexes = m_index_per_table[id];
- for(size_t i = 0; i<indexes.size(); i++)
+ for(unsigned i = 0; i<indexes.size(); i++)
{
const NdbDictionary::Index * const idx = indexes[i];
const char * const idx_name = idx->getName();
@@ -818,7 +818,7 @@ bool BackupRestore::search_replace(char
const char **data, const char *end_data,
uint *new_data_len)
{
- uint search_str_len = strlen(search_str);
+ uint search_str_len = (uint)strlen(search_str);
uint inx = 0;
bool in_delimiters = FALSE;
bool escape_char = FALSE;
@@ -969,7 +969,7 @@ bool BackupRestore::translate_frm(NdbDic
{
DBUG_RETURN(TRUE);
}
- if (map_in_frm(new_data, (const char*)data, data_len, &new_data_len))
+ if (map_in_frm(new_data, (const char*)data, (uint)data_len, &new_data_len))
{
free(new_data);
DBUG_RETURN(TRUE);
@@ -1997,7 +1997,7 @@ BackupRestore::endOfTables(){
return true;
NdbDictionary::Dictionary* dict = m_ndb->getDictionary();
- for(size_t i = 0; i<m_indexes.size(); i++){
+ for(unsigned i = 0; i<m_indexes.size(); i++){
NdbTableImpl & indtab = NdbTableImpl::getImpl(* m_indexes[i]);
BaseString db_name, schema_name, table_name;
=== modified file 'storage/ndb/tools/waiter.cpp'
--- a/storage/ndb/tools/waiter.cpp 2011-02-01 23:27:25 +0000
+++ b/storage/ndb/tools/waiter.cpp 2011-10-21 08:59:23 +0000
@@ -322,7 +322,7 @@ waitClusterStatus(const char* _addr,
* First check if any node is not starting
* then it's no idea to wait anymore
*/
- for (size_t n = 0; n < ndbNodes.size(); n++){
+ for (unsigned n = 0; n < ndbNodes.size(); n++){
if (ndbNodes[n].node_status != NDB_MGM_NODE_STATUS_STARTED &&
ndbNodes[n].node_status != NDB_MGM_NODE_STATUS_STARTING)
waitMore = false;
@@ -359,7 +359,7 @@ waitClusterStatus(const char* _addr,
allInState = (ndbNodes.size() > 0);
/* Loop through all nodes and check their state */
- for (size_t n = 0; n < ndbNodes.size(); n++) {
+ for (unsigned n = 0; n < ndbNodes.size(); n++) {
ndb_mgm_node_state* ndbNode = &ndbNodes[n];
assert(ndbNode != NULL);
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4615 to 4617) | jonas oreland | 21 Oct |
