diff options
| author | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-02-03 00:58:09 +0200 |
|---|---|---|
| committer | jani@a88-113-38-195.elisa-laajakaista.fi <> | 2007-02-03 00:58:09 +0200 |
| commit | cd75806b6165237390951d228664af28f5fe2632 (patch) | |
| tree | 604c311840603ecece2a136bbdc86420a3ec0453 /sql/filesort.cc | |
| parent | ad7b10ca1976dd219e7afce0e1dcc9f256339679 (diff) | |
| parent | 25e481aed854651c6a9247382947202feb16bf3f (diff) | |
| download | mariadb-git-cd75806b6165237390951d228664af28f5fe2632.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 58ca4837858..2f9a96472ca 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -104,7 +104,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length, uint maxbuffer; BUFFPEK *buffpek; ha_rows records= HA_POS_ERROR; - uchar **sort_keys; + uchar **sort_keys= 0; IO_CACHE tempfile, buffpek_pointers, *selected_records_file, *outfile; SORTPARAM param; bool multi_byte_charset; @@ -890,12 +890,14 @@ static void make_sortkey(register SORTPARAM *param, } else { - uchar *end= (uchar*) field->pack((char *) to, field->ptr); #ifdef HAVE_purify + uchar *end= (uchar*) field->pack((char *) to, field->ptr); uint length= (uint) ((to + addonf->length) - end); DBUG_ASSERT((int) length >= 0); if (length) bzero(end, length); +#else + (void) field->pack((char *) to, field->ptr); #endif } to+= addonf->length; |