diff options
| author | unknown <svoj@april.(none)> | 2006-08-14 18:13:50 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-08-14 18:13:50 +0500 |
| commit | ebf58763e2e4970ab303813450105e1a193f8b9e (patch) | |
| tree | b954031168a97d1d02d719338a2244679e2a4c0e /myisam | |
| parent | a756f762e868c73ac9e90ebadfd51f1c3d905499 (diff) | |
| parent | f6d7985a5b4a5c7d94cb04ba003dfa411cf0d3f2 (diff) | |
| download | mariadb-git-ebf58763e2e4970ab303813450105e1a193f8b9e.tar.gz | |
Merge april.(none):/home/svoj/devel/bk/mysql-4.1
into april.(none):/home/svoj/devel/mysql/BUG18874/mysql-4.1
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/sort.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index 96b55d599c8..1a3dc147cd9 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -480,13 +480,6 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) if (!got_error) { share->state.key_map|=(ulonglong) 1 << sinfo->key; - if (param->testflag & T_STATISTICS) - update_key_parts(sinfo->keyinfo, rec_per_key_part, sinfo->unique, - param->stats_method == MI_STATS_METHOD_IGNORE_NULLS? - sinfo->notnull: NULL, - (ulonglong) info->state->records); - - if (!sinfo->buffpek.elements) { if (param->testflag & T_VERBOSE) @@ -498,6 +491,11 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) flush_ft_buf(sinfo) || flush_pending_blocks(sinfo)) got_error=1; } + if (!got_error && param->testflag & T_STATISTICS) + update_key_parts(sinfo->keyinfo, rec_per_key_part, sinfo->unique, + param->stats_method == MI_STATS_METHOD_IGNORE_NULLS? + sinfo->notnull: NULL, + (ulonglong) info->state->records); } my_free((gptr) sinfo->sort_keys,MYF(0)); my_free(mi_get_rec_buff_ptr(info, sinfo->rec_buff), |