diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-26 15:26:28 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-26 15:26:28 +0300 |
| commit | 0c94064bbddde8358b9308f0b0f2ce10e971a35a (patch) | |
| tree | 1d443ccbc69a259401b8fbbdce0a7e01e41f9db7 /sql/sql_table.cc | |
| parent | 18a321adce6f07c62fae971bf022316cc649cfba (diff) | |
| parent | 68e1d7ad4219850e77b4d7979d8b6029bbabaed6 (diff) | |
| download | mariadb-git-0c94064bbddde8358b9308f0b0f2ce10e971a35a.tar.gz | |
merge fix
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 36056851753..8d216f121ab 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2348,8 +2348,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; @@ -2361,9 +2361,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; }; |