diff options
| author | Michael Widenius <monty@mysql.com> | 2011-01-29 12:04:37 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2011-01-29 12:04:37 +0200 |
| commit | 3edf4dcd5a36be8d5acc94e0c5e29e77e47cd15b (patch) | |
| tree | 9240cefc9064c6536d1c0340d5297885ff361130 /storage/ndb | |
| parent | e2bd1ee9df9b3d5d30a518322c925c481ff511a8 (diff) | |
| download | mariadb-git-3edf4dcd5a36be8d5acc94e0c5e29e77e47cd15b.tar.gz | |
Fix compilation errors (and some warnings) when compiling ndb
Fixes part of LP:705213 (Other part is to be pushed into 5.1)
storage/ndb/include/kernel/signaldata/FsOpenReq.hpp:
Fixes compiler warnings
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Update to right typedef
storage/ndb/include/util/NdbSqlUtil.hpp:
Remove not needed, conflicting code.
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Added cast to get rid of not critical const.
Diffstat (limited to 'storage/ndb')
| -rw-r--r-- | storage/ndb/include/kernel/signaldata/FsOpenReq.hpp | 8 | ||||
| -rw-r--r-- | storage/ndb/include/ndbapi/NdbDictionary.hpp | 2 | ||||
| -rw-r--r-- | storage/ndb/include/util/NdbSqlUtil.hpp | 1 | ||||
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp b/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp index 8126267f946..95dbf5204f1 100644 --- a/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp +++ b/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp @@ -203,7 +203,7 @@ Uint32 FsOpenReq::getVersion(const Uint32 fileNumber[]){ inline void FsOpenReq::setVersion(Uint32 fileNumber[], Uint8 val){ const Uint32 t = fileNumber[3]; - fileNumber[3] = t & 0x00FFFFFF | (((Uint32)val) << 24); + fileNumber[3] = (t & 0x00FFFFFF) | (((Uint32)val) << 24); } inline @@ -214,7 +214,7 @@ Uint32 FsOpenReq::getSuffix(const Uint32 fileNumber[]){ inline void FsOpenReq::setSuffix(Uint32 fileNumber[], Uint8 val){ const Uint32 t = fileNumber[3]; - fileNumber[3] = t & 0xFF00FFFF | (((Uint32)val) << 16); + fileNumber[3] = (t & 0xFF00FFFF) | (((Uint32)val) << 16); } inline @@ -225,7 +225,7 @@ Uint32 FsOpenReq::v1_getDisk(const Uint32 fileNumber[]){ inline void FsOpenReq::v1_setDisk(Uint32 fileNumber[], Uint8 val){ const Uint32 t = fileNumber[3]; - fileNumber[3] = t & 0xFFFF00FF | (((Uint32)val) << 8); + fileNumber[3] = (t & 0xFFFF00FF) | (((Uint32)val) << 8); } inline @@ -266,7 +266,7 @@ Uint32 FsOpenReq::v1_getP(const Uint32 fileNumber[]){ inline void FsOpenReq::v1_setP(Uint32 fileNumber[], Uint8 val){ const Uint32 t = fileNumber[3]; - fileNumber[3] = t & 0xFFFFFF00 | val; + fileNumber[3] = (t & 0xFFFFFF00) | val; } /****************/ diff --git a/storage/ndb/include/ndbapi/NdbDictionary.hpp b/storage/ndb/include/ndbapi/NdbDictionary.hpp index 0e782ba9214..8a23802e797 100644 --- a/storage/ndb/include/ndbapi/NdbDictionary.hpp +++ b/storage/ndb/include/ndbapi/NdbDictionary.hpp @@ -20,7 +20,7 @@ class Ndb; struct charset_info_st; -typedef struct charset_info_st CHARSET_INFO; +typedef const struct charset_info_st CHARSET_INFO; /** * @class NdbDictionary diff --git a/storage/ndb/include/util/NdbSqlUtil.hpp b/storage/ndb/include/util/NdbSqlUtil.hpp index 8d063f1908b..77bb79aca82 100644 --- a/storage/ndb/include/util/NdbSqlUtil.hpp +++ b/storage/ndb/include/util/NdbSqlUtil.hpp @@ -20,7 +20,6 @@ #include <kernel/ndb_limits.h> struct charset_info_st; -typedef struct charset_info_st CHARSET_INFO; class NdbSqlUtil { public: diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp index 8c096681b58..e25c15d50a0 100644 --- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp +++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp @@ -2253,7 +2253,7 @@ int Dbtup::interpreterNextLab(Signal* signal, if(AttributeOffset::getCharsetFlag(TattrDesc2)) { Uint32 pos = AttributeOffset::getCharsetPos(TattrDesc2); - cs = tabptr.p->charsetArray[pos]; + cs = (void*) tabptr.p->charsetArray[pos]; } const NdbSqlUtil::Type& sqlType = NdbSqlUtil::getType(typeId); |