diff options
| author | unknown <serg@sergbook.mysql.com> | 2002-07-01 12:58:56 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2002-07-01 12:58:56 +0200 |
| commit | 79bdeb9df8d1ea0810bcc0f2e36b3690c9799a33 (patch) | |
| tree | 940f3c1a6e455335a37e9de7cce1145b4ce07f8f /myisam | |
| parent | 1fee788784bc7519e235233e4461e81ebbaa283c (diff) | |
| parent | 53275045c52cd274d12418fd23268ad1a98bfd0b (diff) | |
| download | mariadb-git-79bdeb9df8d1ea0810bcc0f2e36b3690c9799a33.tar.gz | |
Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index b325f350c2b..7fa30fcca83 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -2503,6 +2503,10 @@ static int sort_key_read(MI_SORT_PARAM *sort_param, void *key) (info->s->rec_reflength+ _mi_make_key(info, sort_param->key, (uchar*) key, sort_param->record, sort_param->filepos)); +#ifdef HAVE_purify + bzero(key+sort_param->real_key_length, + (sort_param->key_length-sort_param->real_key_length)); +#endif DBUG_RETURN(sort_write_record(sort_param)); } /* sort_key_read */ @@ -2536,8 +2540,14 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key) wptr=(FT_WORD*)(sort_param->wordptr); } - sort_param->real_key_length=info->s->rec_reflength+_ft_make_key(info, - sort_param->key,key,wptr++,sort_param->filepos); + sort_param->real_key_length=(info->s->rec_reflength+ + _ft_make_key(info, sort_param->key, + key, wptr++, sort_param->filepos)); +#ifdef HAVE_purify + if (sort_param->key_length > sort_param->real_key_length) + bzero(key+sort_param->real_key_length, + (sort_param->key_length-sort_param->real_key_length)); +#endif if (!wptr->pos) { my_free((char*) sort_param->wordlist, MYF(0)); @@ -2546,10 +2556,10 @@ static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key) else sort_param->wordptr=(void*)wptr; - DBUG_RETURN(error); } /* sort_ft_key_read */ + /* Read next record from file using parameters in sort_info */ /* Return -1 if end of file, 0 if ok and > 0 if error */ |