mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  mysql.com:/usr/home/ram/work/5.0.b12917
This commit is contained in:
unknown 2005-09-12 13:08:08 +05:00
commit c39b411058
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extra/Makefile.am
View file

@ -38,7 +38,7 @@ $(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h
$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \
resolve_stack_dump mysql_waitpid # innochecksum resolve_stack_dump mysql_waitpid innochecksum
noinst_PROGRAMS = charset2html noinst_PROGRAMS = charset2html
# Don't update the files from bitkeeper # Don't update the files from bitkeeper

12
extra/innochecksum.c
View file

@ -140,10 +140,11 @@ int main(int argc, char **argv) {
int now; // current time int now; // current time
int lastt; // last time int lastt; // last time
ulint oldcsum, oldcsumfield, csum, csumfield, logseq, logseqfield; // ulints for checksum storage 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) unsigned long long int size; // size of file (has to be 64 bits)
ulint pages; // number of pages in file 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 ulint start_page = 0, end_page = 0, use_end_page = 0; // for starting and ending at certain pages
off_t offset = 0;
int just_count = 0; // if true, just print page count int just_count = 0; // if true, just print page count
int verbose = 0; int verbose = 0;
int debug = 0; int debug = 0;
@ -202,7 +203,7 @@ int main(int argc, char **argv) {
} }
// stat the file to get size and page count // stat the file to get size and page count
if (stat64(argv[optind], &st)) { if (stat(argv[optind], &st)) {
perror("error statting file"); perror("error statting file");
return 1; return 1;
} }
@ -217,7 +218,7 @@ int main(int argc, char **argv) {
} }
// open the file for reading // open the file for reading
f = fopen64(argv[optind], "r"); f = fopen(argv[optind], "r");
if (!f) { if (!f) {
perror("error opening file"); perror("error opening file");
return 1; return 1;
@ -230,7 +231,10 @@ int main(int argc, char **argv) {
perror("unable to obtain file descriptor number"); perror("unable to obtain file descriptor number");
return 1; return 1;
} }
if (lseek64(fd, start_page * UNIV_PAGE_SIZE, SEEK_SET) != (start_page * UNIV_PAGE_SIZE)) {
offset = (off_t)start_page * (off_t)UNIV_PAGE_SIZE;
if (lseek(fd, offset, SEEK_SET) != offset) {
perror("unable to seek to necessary offset"); perror("unable to seek to necessary offset");
return 1; return 1;
} }