diff options
| author | Monty <monty@mariadb.org> | 2016-03-22 21:51:59 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-03-22 23:44:52 +0200 |
| commit | 260dd476b057b759af7973550b560dc2f56e18fd (patch) | |
| tree | ef55ede44a6f47171ca9f2a2121f377a6ea15832 /storage/spider | |
| parent | d0a47704c5d4360a3076c0e6b8abec186fac1f39 (diff) | |
| download | mariadb-git-260dd476b057b759af7973550b560dc2f56e18fd.tar.gz | |
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.
Diffstat (limited to 'storage/spider')
| -rw-r--r-- | storage/spider/spd_trx.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc index d7127fa0084..b376265c1e7 100644 --- a/storage/spider/spd_trx.cc +++ b/storage/spider/spd_trx.cc @@ -2683,7 +2683,8 @@ int spider_initinal_xa_recover( FALSE, open_tables_backup, TRUE, &error_num)) ) goto error_open_table; - init_read_record(read_record, thd, table_xa, NULL, TRUE, FALSE, FALSE); + init_read_record(read_record, thd, table_xa, NULL, NULL, TRUE, FALSE, + FALSE); } SPD_INIT_ALLOC_ROOT(&mem_root, 4096, 0, MYF(MY_WME)); while ((!(read_record->read_record(read_record))) && cnt < (int) len) |