From a7f8b1cb4d5c36f55fffa09ce8b84a1741aeb9f0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 24 Apr 2003 14:33:33 +0300 Subject: Many files: Added the MAX_LENGTH_FOR_SORT_DATA option filesort.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/filesort.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/mysqld.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/opt_range.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/records.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/set_var.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/sql_base.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/sql_class.h: Added the MAX_LENGTH_FOR_SORT_DATA option sql/sql_delete.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/sql_select.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/sql_sort.h: Added the MAX_LENGTH_FOR_SORT_DATA option sql/sql_table.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/sql_update.cc: Added the MAX_LENGTH_FOR_SORT_DATA option sql/structs.h: Added the MAX_LENGTH_FOR_SORT_DATA option sql/table.h: Added the MAX_LENGTH_FOR_SORT_DATA option sql/uniques.cc: Added the MAX_LENGTH_FOR_SORT_DATA option --- sql/sql_table.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sql/sql_table.cc') diff --git a/sql/sql_table.cc b/sql/sql_table.cc index f4bcd6bd684..a4e526d403f 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2342,8 +2342,8 @@ copy_data_between_tables(TABLE *from,TABLE *to, if (order) { - from->io_cache=(IO_CACHE*) my_malloc(sizeof(IO_CACHE), - MYF(MY_FAE | MY_ZEROFILL)); + from->sort.io_cache=(IO_CACHE*) my_malloc(sizeof(IO_CACHE), + MYF(MY_FAE | MY_ZEROFILL)); bzero((char*) &tables,sizeof(tables)); tables.table = from; tables.alias = tables.real_name= from->real_name; @@ -2355,9 +2355,9 @@ copy_data_between_tables(TABLE *from,TABLE *to, setup_order(thd, thd->lex.select_lex.ref_pointer_array, &tables, fields, all_fields, order) || !(sortorder=make_unireg_sortorder(order, &length)) || - (from->found_records = filesort(thd, from, sortorder, length, - (SQL_SELECT *) 0, HA_POS_ERROR, - &examined_rows)) + (from->sort.found_records = filesort(thd, from, sortorder, length, + (SQL_SELECT *) 0, HA_POS_ERROR, + &examined_rows)) == HA_POS_ERROR) goto err; }; -- cgit v1.2.1