diff options
| author | Martin Hansson <martin.hansson@sun.com> | 2010-06-24 15:21:23 +0200 |
|---|---|---|
| committer | Martin Hansson <martin.hansson@sun.com> | 2010-06-24 15:21:23 +0200 |
| commit | dac59fa9c3dab835872b9e9581ed5414d113e09e (patch) | |
| tree | 2021a4b16d7dd8402d35c567685bc77fcdd32115 /sql/sql_class.h | |
| parent | a08780df9875acbdaec98d7e985a823a4202fad0 (diff) | |
| download | mariadb-git-dac59fa9c3dab835872b9e9581ed5414d113e09e.tar.gz | |
Bug#41660: Sort-index_merge for non-first join table may
require O(#scans) memory
When an index merge operation was restarted, it would
re-allocate the Unique object controlling the duplicate row
ID elimination. Fixed by making the Unique object a member
of QUICK_INDEX_MERGE_SELECT and thus reusing it throughout
the lifetime of this object.
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 19a433746e4..4c1d4a98db0 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2935,6 +2935,9 @@ public: void reset(); bool walk(tree_walk_action action, void *walk_action_arg); + uint get_size() const { return size; } + ulonglong get_max_in_memory_size() const { return max_in_memory_size; } + friend int unique_write_to_file(uchar* key, element_count count, Unique *unique); friend int unique_write_to_ptrs(uchar* key, element_count count, Unique *unique); }; |