← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/mysql-dfsg-5.0/gutsy

« back to all changes in this revision

Viewing changes to ndb/src/common/util/File.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2007-04-03 09:43:01 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20070403094301-fnjhfr59hu72pvtg
Tags: 5.0.38-0ubuntu1
* Package the Enterprise version again (.37 was a community version), since
  Debian and we have always done so. This brings in a few more bug fixes and
  makes functional derivations less likely.
* debian/README.Maintainer: Add pointer to upstream download URL, since it
  is very hard to find the Enterprise versions.
* Disable 33_scripts__mysql_create_system_tables__no_test.dpatch, since that
  script was removed upstream.
* debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch: Adapted to
  changed formatting in new upstream version.
* Remove debian/patches/86_PATH_MAX.dpatch, fixed upstream.
* Add debian/patches/90_org_tables_definition.dpatch: Fix local variable
  declaration in libmysqld/sql_parse.cc to fix compilation with
  EMBEDDED_LIBRARY.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ndb/src/common/util/File.cpp
50
50
  MY_STAT s;
51
51
 
52
52
  // Note that my_fstat behaves *differently* than my_stat. ARGGGHH!
53
 
  if(my_fstat(fileno(f), &s, MYF(0)))
 
53
  if(my_fstat(::fileno(f), &s, MYF(0)))
54
54
    return 0;
55
55
 
56
56
  return s.st_size;
162
162
}
163
163
 
164
164
int 
165
 
File_class::write(const void* buf, size_t size, size_t nitems)
 
165
File_class::write(const void* buf, size_t size_arg, size_t nitems)
166
166
{
167
 
  return ::fwrite(buf, size, nitems, m_file);
 
167
  return ::fwrite(buf, size_arg, nitems, m_file);
168
168
}
169
169
 
170
170
int