summaryrefslogtreecommitdiff
path: root/sql/sql_sort.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/sql_sort.h')
-rw-r--r--sql/sql_sort.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_sort.h b/sql/sql_sort.h
index 5b3f5a67d17..cff54f18bde 100644
--- a/sql/sql_sort.h
+++ b/sql/sql_sort.h
@@ -536,7 +536,7 @@ public:
uchar *unique_buff;
bool not_killable;
- char* tmp_buffer;
+ String tmp_buffer;
// The fields below are used only by Unique class.
qsort2_cmp compare;
BUFFPEK_COMPARE_CONTEXT cmp_context;
@@ -544,6 +544,7 @@ public:
Sort_param()
{
memset(reinterpret_cast<void*>(this), 0, sizeof(*this));
+ tmp_buffer.set_thread_specific();
}
void init_for_filesort(uint sortlen, TABLE *table,
ha_rows maxrows, bool sort_positions);