At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2847 revision-id: sergii@pisem.net-20100812105413-mkgrna3vi419os48 parent: monty@mysql.com-20100810220446-jzy713163fjegn30 committer: Sergei Golubchik <sergii@pisem.net> branch nick: 5.2 timestamp: Thu 2010-08-12 14:54:13 +0400 message: fix ndb to build after recent CHARSET_INFO change === modified file 'storage/ndb/include/ndbapi/NdbDictionary.hpp' --- a/storage/ndb/include/ndbapi/NdbDictionary.hpp 2007-12-07 10:05:19 +0000 +++ b/storage/ndb/include/ndbapi/NdbDictionary.hpp 2010-08-12 10:54:13 +0000 @@ -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 === modified file 'storage/ndb/include/util/NdbSqlUtil.hpp' --- a/storage/ndb/include/util/NdbSqlUtil.hpp 2006-12-23 19:20:40 +0000 +++ b/storage/ndb/include/util/NdbSqlUtil.hpp 2010-08-12 10:54:13 +0000 @@ -20,7 +20,7 @@ #include <kernel/ndb_limits.h> struct charset_info_st; -typedef struct charset_info_st CHARSET_INFO; +typedef const struct charset_info_st CHARSET_INFO; class NdbSqlUtil { public: === modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp' --- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2008-02-06 12:06:05 +0000 +++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2010-08-12 10:54:13 +0000 @@ -2249,7 +2249,7 @@ int Dbtup::interpreterNextLab(Signal* si Uint32 TattrDesc1 = tableDescriptor[TattrDescrIndex].tabDescr; Uint32 TattrDesc2 = tableDescriptor[TattrDescrIndex+1].tabDescr; Uint32 typeId = AttributeDescriptor::getType(TattrDesc1); - void * cs = 0; + const void * cs = 0; if(AttributeOffset::getCharsetFlag(TattrDesc2)) { Uint32 pos = AttributeOffset::getCharsetPos(TattrDesc2);