diff options
| author | unknown <stewart@mysql.com> | 2005-06-07 12:44:00 +1000 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2005-06-07 12:44:00 +1000 |
| commit | 6f1db965ad6c798ab38e7b28fcd55667659129b3 (patch) | |
| tree | 88c10f4b059611576a04a71f35e82216e9c974f6 /ndb | |
| parent | e90b64cda4466566db12969a3a40f614a97cc329 (diff) | |
| parent | e3dc3db659a5d8edec4d46635d069d0c1777bb8c (diff) | |
| download | mariadb-git-6f1db965ad6c798ab38e7b28fcd55667659129b3.tar.gz | |
merge
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/ndbapi/DictCache.cpp | 3 | ||||
| -rw-r--r-- | ndb/src/ndbapi/DictCache.hpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ndb/src/ndbapi/DictCache.cpp b/ndb/src/ndbapi/DictCache.cpp index da9d5b70d47..ccc45a04824 100644 --- a/ndb/src/ndbapi/DictCache.cpp +++ b/ndb/src/ndbapi/DictCache.cpp @@ -24,7 +24,8 @@ Ndb_local_table_info * Ndb_local_table_info::create(NdbTableImpl *table_impl, Uint32 sz) { - Uint32 tot_size= sizeof(NdbTableImpl *) + ((sz+7) & ~7); // round to Uint64 + Uint32 tot_size= sizeof(Ndb_local_table_info) - sizeof(Uint64) + + ((sz+7) & ~7); // round to Uint64 void *data= malloc(tot_size); if (data == 0) return 0; diff --git a/ndb/src/ndbapi/DictCache.hpp b/ndb/src/ndbapi/DictCache.hpp index 58c08a93e61..ca31c345396 100644 --- a/ndb/src/ndbapi/DictCache.hpp +++ b/ndb/src/ndbapi/DictCache.hpp @@ -33,7 +33,7 @@ public: static Ndb_local_table_info *create(NdbTableImpl *table_impl, Uint32 sz=0); static void destroy(Ndb_local_table_info *); NdbTableImpl *m_table_impl; - Uint64 m_local_data[1]; + Uint64 m_local_data[1]; // Must be last member. Used to access extra space. private: Ndb_local_table_info(NdbTableImpl *table_impl); ~Ndb_local_table_info(); |