diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-07-01 02:55:57 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-07-01 02:55:57 +0300 |
| commit | f26ae21229b11bae1b031b6ab68e9f43c9716f9e (patch) | |
| tree | 22ce06c026fd8287b40f223ea6971ed1e3a070bf /myisam/mi_check.c | |
| parent | b09ab3413cd0938f19570676d1b65af98544bcf2 (diff) | |
| parent | 05939f456bad9d245b3887fd280833b72beb8c14 (diff) | |
| download | mariadb-git-f26ae21229b11bae1b031b6ab68e9f43c9716f9e.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
myisam/mi_check.c:
Auto merged
Diffstat (limited to 'myisam/mi_check.c')
| -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 */ |