bzr commit into mysql-5.1 branch (jonas:2679)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/

 2679 Jonas Oreland	2008-08-28 [merge]
      ndb - merge compile fixes
modified:
  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
  storage/ndb/src/kernel/vm/LockQueue.hpp

=== modified file 'storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp'
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp	2007-11-29 06:51:18 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp	2008-08-28 08:11:47 +0000
@@ -218,6 +218,7 @@ private:
   /**
    * Unlikely to need to implement these. readvReq for iovec
    */
+protected:
   virtual void readReq(Request *request);
   virtual void readvReq(Request *request);
 

=== modified file 'storage/ndb/src/kernel/vm/LockQueue.hpp'
--- a/storage/ndb/src/kernel/vm/LockQueue.hpp	2007-11-13 08:34:38 +0000
+++ b/storage/ndb/src/kernel/vm/LockQueue.hpp	2008-08-28 07:54:47 +0000
@@ -39,7 +39,7 @@ public:
     Uint32 prevList;
   };
 
-  typedef class ArrayPool<LockQueueElement> Pool;
+  typedef ArrayPool<LockQueueElement> Pool;
   
   Uint32 lock(Pool&, const UtilLockReq * req, const UtilLockReq** lockOwner= 0);
   Uint32 unlock(Pool&, const UtilUnlockReq* req);