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.

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;
 }
 
 /****************/

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

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:

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);