summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorjonas@perch.ndb.mysql.com <>2007-07-03 16:37:15 +0200
committerjonas@perch.ndb.mysql.com <>2007-07-03 16:37:15 +0200
commit2ed75f25ae8243475cfd56e21a7d1b20a470651b (patch)
treee67b8bbd4aedb1f2573aad504979970ca7efee80 /storage
parentb57f59909e29c37fcb9988ad5abf88fa7fff66b8 (diff)
parent7fbcaa87b5966e99b74eca48d7a32a451aca2238 (diff)
downloadmariadb-git-2ed75f25ae8243475cfd56e21a7d1b20a470651b.tar.gz
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
index 673587b1ed7..aa9bd174471 100644
--- a/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
@@ -391,7 +391,7 @@ struct NdbFileImpl : public NdbDictObjectImpl {
NdbFileImpl(NdbDictionary::Object::Type t);
Uint64 m_size;
- Uint32 m_free;
+ Uint64 m_free;
BaseString m_path;
BaseString m_filegroup_name;
Uint32 m_filegroup_id;