diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-10-25 18:28:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-10-25 18:28:31 +0200 |
| commit | 675f27b382457de77d8a128124b132439eb5cfaf (patch) | |
| tree | 4ee3476bdb0bc6659af46f26190a8f6dda15e85e /extra | |
| parent | 12c3e16dfa872f19186761da28590c2703c96a6b (diff) | |
| parent | d7dc03a26797f07625e8c44d2d1ac7f76e860bad (diff) | |
| download | mariadb-git-675f27b382457de77d8a128124b132439eb5cfaf.tar.gz | |
Merge branch 'merge/merge-xtradb-5.6' into 10.0
commented out the "compressed columns" feature
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/innochecksum.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc index 97d47b4563a..c09458630c8 100644 --- a/extra/innochecksum.cc +++ b/extra/innochecksum.cc @@ -245,7 +245,7 @@ int main(int argc, char **argv) /* ulints for checksum storage */ unsigned long long int size; /* size of file (has to be 64 bits) */ ulint pages; /* number of pages in file */ - unsigned long long offset= 0; + long long offset= 0; int fd; printf("InnoDB offline file checksum utility.\n"); @@ -390,7 +390,7 @@ int main(int argc, char **argv) goto error; } - offset= (ulonglong)start_page * (ulonglong)physical_page_size; + offset= (longlong)start_page * (longlong)physical_page_size; #ifdef _WIN32 if (_lseeki64(fd, offset, SEEK_SET) != offset) #else |