diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-26 00:10:43 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-26 00:10:43 +0300 |
| commit | 651030923462ac4620dbf0f1db1ca213b99aff25 (patch) | |
| tree | c7e95f892311117dd6e5a6a90652b4fd60966699 /mysys | |
| parent | 6ca7bfb9e0304b63b374eadc270ba25fe15c59a3 (diff) | |
| download | mariadb-git-651030923462ac4620dbf0f1db1ca213b99aff25.tar.gz | |
Fixed all mysqldump output to use 'result_file'
client/mysqldump.c:
Fixed all output to use 'result_file'
mysys/my_error.c:
cleanup
mysys/raid.cc:
cleanup
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_error.c | 2 | ||||
| -rw-r--r-- | mysys/raid.cc | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mysys/my_error.c b/mysys/my_error.c index 6887126e6ec..4aa946aa6c3 100644 --- a/mysys/my_error.c +++ b/mysys/my_error.c @@ -66,7 +66,7 @@ int my_error(int nr,myf MyFlags, ...) while (isdigit(*tpos) || *tpos == '.' || *tpos == '-') tpos++; if (*tpos == 'l') /* Skipp 'l' argument */ - *tpos++; + tpos++; if (*tpos == 's') /* String parameter */ { par = va_arg(ap, char *); diff --git a/mysys/raid.cc b/mysys/raid.cc index a92647d1d95..48aa5cdb134 100644 --- a/mysys/raid.cc +++ b/mysys/raid.cc @@ -788,7 +788,7 @@ Fstat(int fd, MY_STAT *stat_area, myf MyFlags ) DBUG_PRINT("enter",("fd: %d MyFlags: %d",fd,MyFlags)); uint i; int error=0; - MY_STAT my_stat; + MY_STAT status; stat_area->st_size=0; stat_area->st_mtime=0; stat_area->st_atime=0; @@ -796,12 +796,12 @@ Fstat(int fd, MY_STAT *stat_area, myf MyFlags ) for(i=0 ; i < _raid_chunks ; i++) { - if (my_fstat(_fd_vector[i],&my_stat,MyFlags)) + if (my_fstat(_fd_vector[i],&status,MyFlags)) error=1; - stat_area->st_size+=my_stat.st_size; - set_if_bigger(stat_area->st_mtime,my_stat.st_mtime); - set_if_bigger(stat_area->st_atime,my_stat.st_atime); - set_if_bigger(stat_area->st_ctime,my_stat.st_ctime); + stat_area->st_size+=status.st_size; + set_if_bigger(stat_area->st_mtime,status.st_mtime); + set_if_bigger(stat_area->st_atime,status.st_atime); + set_if_bigger(stat_area->st_ctime,status.st_ctime); } DBUG_RETURN(error); } |