bk commit into 5.0 tree (jan:1.1937)

[Jan Lindstrom]

Below is the list of changes that have just been committed into a local
5.0 repository of jan. When jan 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
  1.1937 05/09/05 15:48:36 jan@stripped +1 -0
  Fix compiler errors on FreeBSD. Use normal file operations instead of
  64 bit versions.

  extra/innochecksum.c
    1.2 05/09/05 15:48:26 jan@stripped +4 -4
    Fix compiler errors on FreeBSD. Use normal file operations instead of
    64 bit versions.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jan
# Host:	hundin.mysql.fi
# Root:	/home/jan/mysql-5.0

--- 1.1/extra/innochecksum.c	2005-07-19 10:02:23 +03:00
+++ 1.2/extra/innochecksum.c	2005-09-05 15:48:26 +03:00
@@ -140,7 +140,7 @@
     int now; // current time
     int lastt; // last time
     ulint oldcsum, oldcsumfield, csum, csumfield, logseq, logseqfield; // ulints for checksum storage
-    struct stat64 st; // for stat, if you couldn't guess
+    struct stat st; // for stat, if you couldn't guess
     unsigned long long int size; // size of file (has to be 64 bits)
     ulint pages; // number of pages in file
     ulint start_page = 0, end_page = 0, use_end_page = 0; // for starting and ending at certain pages
@@ -202,7 +202,7 @@
     }
 
     // stat the file to get size and page count
-    if (stat64(argv[optind], &st)) {
+    if (stat(argv[optind], &st)) {
         perror("error statting file");
         return 1;
     }
@@ -217,7 +217,7 @@
     }
 
     // open the file for reading
-    f = fopen64(argv[optind], "r");
+    f = fopen(argv[optind], "r");
     if (!f) {
         perror("error opening file");
         return 1;
@@ -230,7 +230,7 @@
             perror("unable to obtain file descriptor number");
             return 1;
         }
-        if (lseek64(fd, start_page * UNIV_PAGE_SIZE, SEEK_SET) != (start_page * UNIV_PAGE_SIZE)) {
+        if (lseek(fd, start_page * UNIV_PAGE_SIZE, SEEK_SET) != (off_t)(start_page * UNIV_PAGE_SIZE)) {
             perror("unable to seek to necessary offset");
             return 1;
         }