diff options
Diffstat (limited to 'sql/sql_sort.h')
| -rw-r--r-- | sql/sql_sort.h | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/sql/sql_sort.h b/sql/sql_sort.h index 8169cd0406e..f1a3a2f9d8b 100644 --- a/sql/sql_sort.h +++ b/sql/sql_sort.h @@ -1,4 +1,7 @@ -/* Copyright (c) 2000, 2001, 2003, 2007 MySQL AB +#ifndef SQL_SORT_INCLUDED +#define SQL_SORT_INCLUDED + +/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,7 +14,19 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "my_global.h" /* uchar */ +#include "my_base.h" /* ha_rows */ +#include "my_sys.h" /* qsort2_cmp */ +#include "queues.h" + +typedef struct st_buffpek BUFFPEK; +typedef struct st_sort_field SORT_FIELD; + +class Field; +struct TABLE; + /* Defines used by filesort and uniques */ @@ -57,7 +72,7 @@ typedef struct st_sort_param { uint addon_length; /* Length of added packed fields */ uint res_length; /* Length of records in final sorted file/buffer */ uint keys; /* Max keys / buffer */ - element_count min_dupl_count; + uint min_dupl_count; ha_rows max_rows,examined_rows; TABLE *sort_form; /* For quicker make_sortkey */ SORT_FIELD *local_sortorder; @@ -87,3 +102,4 @@ int merge_index(SORTPARAM *param, uchar *sort_buffer, void reuse_freed_buff(QUEUE *queue, BUFFPEK *reuse, uint key_length); +#endif /* SQL_SORT_INCLUDED */ |