mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Removed TABLE->sort to make it possible to have multiple active calls to
filesort and init_read_record() for the same table. This will simplify code for WINDOW FUNCTIONS (MDEV-6115) - Filesort_info renamed to SORT_INFO and moved to filesort.h - filesort now returns SORT_INFO - init_read_record() now takes a SORT_INFO parameter. - unique declaration is moved to uniques.h - subselect caching of buffers is now more explicit than before - filesort_buffer is now reusable even if rec_length has changed. - filsort_free_buffers() and free_io_cache() calls are removed - Remove one malloc() when using get_addon_fields() Other things: - Added --debug-assert-on-not-freed-memory option to make it easier to debug some not-freed-memory issues.
This commit is contained in:
@ -16,8 +16,6 @@
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
||||
|
||||
#include "m_string.h" /* memset */
|
||||
#include "my_global.h" /* uchar */
|
||||
#include "my_base.h" /* ha_rows */
|
||||
#include "my_sys.h" /* qsort2_cmp */
|
||||
#include "queues.h"
|
||||
@ -71,7 +69,6 @@ public:
|
||||
uint rec_length; // Length of sorted records.
|
||||
uint sort_length; // Length of sorted columns.
|
||||
uint ref_length; // Length of record ref.
|
||||
uint addon_length; // Length of added packed fields.
|
||||
uint res_length; // Length of records in final sorted file/buffer.
|
||||
uint max_keys_per_buffer; // Max keys / buffer.
|
||||
uint min_dupl_count;
|
||||
@ -81,6 +78,8 @@ public:
|
||||
SORT_FIELD *local_sortorder;
|
||||
SORT_FIELD *end;
|
||||
SORT_ADDON_FIELD *addon_field; // Descriptors for companion fields.
|
||||
LEX_STRING addon_buf; // Buffer & length of added packed fields.
|
||||
|
||||
uchar *unique_buff;
|
||||
bool not_killable;
|
||||
char* tmp_buffer;
|
||||
|
Reference in New Issue
Block a user