bk commit into 5.1 tree (jonas:1.2550)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-03 16:37:15+02:00, jonas@stripped +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
  MERGE: 1.2403.18.75

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@stripped, 2007-07-03 16:37:11+02:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.71.1.2

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new-ndb/RESYNC

--- 1.75/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2007-07-03 16:37:21 +02:00
+++ 1.76/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2007-07-03 16:37:21 +02:00
@@ -391,7 +391,7 @@
   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;