mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb

Browse source 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb


ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown 2005-01-07 15:34:25 +01:00
commit 15d7da2b3d
214 changed files with 7809 additions and 3161 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/filesort.cc
View file

@ -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]);