diff options
| author | mskold@mysql.com <> | 2005-01-07 15:34:25 +0100 |
|---|---|---|
| committer | mskold@mysql.com <> | 2005-01-07 15:34:25 +0100 |
| commit | 346aeda888e52bcf40766964bbd299c5eb4d0c89 (patch) | |
| tree | eb273ba99a8838add7aeac8f869d5fab40e973c0 /sql/filesort.cc | |
| parent | b441ace70002c52364d5e16075832928115dbc0b (diff) | |
| parent | 5c36000f69b860c3b7b6623503b9a9c47969f631 (diff) | |
| download | mariadb-git-346aeda888e52bcf40766964bbd299c5eb4d0c89.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 59e2491a7a2..6bad5202ec6 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -127,7 +127,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length, param.ref_length= table->file->ref_length; param.addon_field= 0; param.addon_length= 0; - if (!(table->tmp_table || table->fulltext_searched)) + if (!(table->s->tmp_table || table->fulltext_searched)) { /* Get the descriptors of all fields whose values are appended @@ -463,7 +463,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, if (!flag) { my_store_ptr(ref_pos,ref_length,record); // Position to row - record+=sort_form->db_record_offset; + record+= sort_form->s->db_record_offset; } else file->position(sort_form->record[0]); |