diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2005-10-27 23:43:20 +0300 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2005-10-27 23:43:20 +0300 |
| commit | cbe21a8eb6c53ed4eb7f6228a322d642abacde95 (patch) | |
| tree | ff71298ae3c57caff8ca7c70666d60292290e366 /myisam/sort.c | |
| parent | 2025b35544f2a43322a9fd3574d19469383009c2 (diff) | |
| parent | a57c08d46815c13c09e713a3ea05076c19001a0e (diff) | |
| download | mariadb-git-cbe21a8eb6c53ed4eb7f6228a322d642abacde95.tar.gz | |
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
Diffstat (limited to 'myisam/sort.c')
| -rw-r--r-- | myisam/sort.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index 6c718a0d453..c3eaddb3e92 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -481,8 +481,12 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) { mi_set_key_active(share->state.key_map, sinfo->key); if (param->testflag & T_STATISTICS) - update_key_parts(sinfo->keyinfo, rec_per_key_part, - sinfo->unique, (ulonglong) info->state->records); + 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) |