bk commit into 5.1 tree (stewart:1.2748)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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-11-29 16:51:18+10:00, stewart@willster.(none) +2 -0
  Fix compiler warnings

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@stripped, 2007-11-29 16:51:13+10:00,
stewart@willster.(none) +0 -25
    Remove dead code (and a warning)

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp@stripped, 2007-11-29 16:51:13+10:00,
stewart@willster.(none) +1 -0
    Fix warning

diff -Nrup a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2007-11-29 09:30:42 +10:00
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2007-11-29 16:51:13 +10:00
@@ -315,31 +315,6 @@ AsyncFile::writevReq( Request * request)
   writeReq(request);
 }
 
-/*
-void
-AsyncFile::closeReq(Request * request)
-{
-  // FIXME: Stewart should check all callers why this is here.
-/*  if (m_open_flags & (
-      FsOpenReq::OM_WRITEONLY |
-      FsOpenReq::OM_READWRITE |
-      FsOpenReq::OM_APPEND )) {
-    syncReq(request);
-  }
-*/
-//}
-
-/*void
-AsyncFile::syncReq(Request * request)
-{
-  // FIXME: Stewart to find out why these are here
-  if(m_auto_sync_freq && m_write_wo_sync == 0){
-    return;
-  }
-  // do sync
-  m_write_wo_sync = 0;
-  }*/
-
 void AsyncFile::endReq()
 {
   if (theWriteBuffer)
diff -Nrup a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp	2007-11-29 09:32:18 +10:00
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp	2007-11-29 16:51:13 +10:00
@@ -159,6 +159,7 @@ class AsyncFile
   friend class Ndbfs;
 public:
   AsyncFile(SimulatedBlock& fs);
+  virtual ~AsyncFile() {};
 
   void reportTo( MemoryChannel<Request> *reportTo );