diff options
| author | unknown <serg@sergbook.mysql.com> | 2002-07-01 01:36:00 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2002-07-01 01:36:00 +0200 |
| commit | 7920ef791a0b4b61fb8d9f5aaa0e628286d20065 (patch) | |
| tree | dc1004eccf3f89248d8f6487251de12101d7db6f | |
| parent | ff1dc1229713a1ee1ef34bcb321e43bea176f16a (diff) | |
| parent | b09ab3413cd0938f19570676d1b65af98544bcf2 (diff) | |
| download | mariadb-git-7920ef791a0b4b61fb8d9f5aaa0e628286d20065.tar.gz | |
Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
| -rw-r--r-- | myisam/mi_check.c | 4 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 2 | ||||
| -rw-r--r-- | mysys/mf_iocache.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index f27f297b3a4..b325f350c2b 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -2109,7 +2109,7 @@ err: DESCRIPTION Same as mi_repair_by_sort but do it multithreaded Each key is handled by a separate thread. - TODO: make a number of thread a parameter + TODO: make a number of threads a parameter RESULT 0 ok @@ -2358,7 +2358,7 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, } got_error=1; /* Assume the following may go wrong */ - if (sort_param->fix_datafile) + if (sort_param[0].fix_datafile) { if (write_data_suffix(&sort_info,1) || end_io_cache(&info->rec_cache)) goto err; diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 0ac089bd261..db03177edfc 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -219,7 +219,7 @@ static struct my_option my_long_options[] = {"recover", 'r', "Can fix almost anything except unique keys that aren't unique.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"paraller-recover", 'p', + {"parallel-recover", 'p', "Same as '-r' but creates all the keys in parallel", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, {"safe-recover", 'o', diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 6ad5397e61f..54513ba73de 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -508,7 +508,6 @@ int _my_b_read_r(register IO_CACHE *info, byte *Buffer, uint Count) pos_in_file= info->pos_in_file + (uint)(info->read_end - info->buffer); diff_length= (uint) (pos_in_file & (IO_SIZE-1)); length=IO_ROUND_UP(Count+diff_length)-diff_length; - length=IO_ROUND_UP(Count+diff_length)-diff_length; length=(length <= info->read_length) ? length + IO_ROUND_DN(info->read_length - length) : length - IO_ROUND_UP(length - info->read_length) ; |