Commit cc5abe68 authored by unknown's avatar unknown
Browse files

Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb 

into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work


ndb/include/logger/FileLogHandler.hpp:
  Auto merged
ndb/include/util/File.hpp:
  Auto merged
ndb/include/util/Vector.hpp:
  Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged
parents 655650f5 45cbd3c1

ndb/include/logger/FileLogHandler.hpp

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ private: 
  bool setMaxFiles(const BaseString &files);

  

  int m_maxNoFiles;

  long m_maxFileSize;

  off_t m_maxFileSize;

  unsigned int m_maxLogEntries;

  File_class* m_pLogFile;

};

ndb/include/util/File.hpp

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public: 
   * @param f a pointer to a FILE descriptor.

   * @return the size of the file.

   */

  static long size(FILE* f);

  static off_t size(FILE* f);



  /**

   * Renames a file.
@@ -181,7 +181,7 @@ public: 
   *

   * @return the file size.

   */

  long size() const;

  off_t size() const;



  /**

   * Returns the filename.

ndb/include/util/Vector.hpp

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ void 
Vector<T>::push_back(const T & t){

  if(m_size == m_arraySize){

    T * tmp = new T [m_arraySize + m_incSize];

    if(!tmp)

      abort();

    for (unsigned k = 0; k < m_size; k++)

      tmp[k] = m_items[k];

    delete[] m_items;

ndb/src/common/logger/FileLogHandler.cpp

+0 −2
Original line number Diff line number Diff line
@@ -124,8 +124,6 @@ FileLogHandler::writeFooter() 
  }

  callCount++;



  // Needed on Cello since writes to the flash disk does not happen until 

  // we flush and fsync.

  m_pLogFile->flush();

}

ndb/src/common/util/File.cpp

+10 −15
Original line number Diff line number Diff line
@@ -44,17 +44,16 @@ File_class::exists(const char* aFileName) 
  return (my_stat(aFileName, &stmp, MYF(0))!=NULL);

}



long

off_t

File_class::size(FILE* f)

{

  long cur_pos = 0, length = 0;

  MY_STAT s;



  cur_pos = ::ftell(f);

  ::fseek(f, 0, SEEK_END); 

  length = ::ftell(f); 

  ::fseek(f, cur_pos, SEEK_SET); // restore original position

  // Note that my_fstat behaves *differently* than my_stat. ARGGGHH!

  if(my_fstat(::fileno(f), &s, MYF(0)))

    return 0;



  return length;

  return s.st_size;

}



bool
@@ -180,7 +179,7 @@ File_class::writeChar(const char* buf) 
  return writeChar(buf, 0, ::strlen(buf));

}



long 

off_t

File_class::size() const

{

  return File_class::size(m_file);
@@ -199,10 +198,6 @@ File_class::flush() const 
  ::fflush(m_file);

  return ::fsync(::fileno(m_file));

#else

  return 0;

  return ::fflush(m_file);;

#endif

}
 


//

// PRIVATE

//