database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Fix compilation errors (and some warnings) when compiling ndb

Browse Source 
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.
This commit is contained in:
Michael Widenius
2011-01-29 12:04:37 +02:00
parent e2bd1ee9df
commit 3edf4dcd5a
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
View File

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