summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <stewart@willster.(none)>2006-10-27 18:08:08 +1000
committerunknown <stewart@willster.(none)>2006-10-27 18:08:08 +1000
commitb82448833566bbd43434d6d23035e68013483012 (patch)
tree8b3a6a9d089b305b1aa13efbb50421bf163db5da /ndb
parente2ea6f70b3e0b1f7e82b384e79fc992557ca8e2d (diff)
downloadmariadb-git-b82448833566bbd43434d6d23035e68013483012.tar.gz
BUG#22310 dead/deceptive code in FileLogHandler::writeFooter() and File_class::flush
make the File_class::flush() method actually flush the stdio buffers. ndb/src/common/logger/FileLogHandler.cpp: remove misleading comment ndb/src/common/util/File.cpp: actually flush the stdio buffers. remove unneeded // private comment
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/common/logger/FileLogHandler.cpp2
-rw-r--r--ndb/src/common/util/File.cpp6
2 files changed, 1 insertions, 7 deletions
diff --git a/ndb/src/common/logger/FileLogHandler.cpp b/ndb/src/common/logger/FileLogHandler.cpp
index b8859630406..cf757064aa0 100644
--- a/ndb/src/common/logger/FileLogHandler.cpp
+++ b/ndb/src/common/logger/FileLogHandler.cpp
@@ -125,8 +125,6 @@ FileLogHandler::writeFooter()
}
callCount++;
- // Needed on Cello since writes to the flash disk does not happen until
- // we flush and fsync.
m_pLogFile->flush();
}
diff --git a/ndb/src/common/util/File.cpp b/ndb/src/common/util/File.cpp
index 056b7ff199b..4f0b6bb77b0 100644
--- a/ndb/src/common/util/File.cpp
+++ b/ndb/src/common/util/File.cpp
@@ -188,10 +188,6 @@ File_class::flush() const
::fflush(m_file);
return ::fsync(::fileno(m_file));
#else
- return 0;
+ return ::fflush(m_file);;
#endif
}
-
-//
-// PRIVATE
-//