diff options
| author | Varun Gupta <varun.gupta@mariadb.com> | 2020-05-30 16:58:42 +0530 |
|---|---|---|
| committer | Varun Gupta <varun.gupta@mariadb.com> | 2020-05-30 16:58:42 +0530 |
| commit | 8c9430a3fd152c0dfa4dcfe144b49a3b61e81eee (patch) | |
| tree | 82e4b51c646af29358cb292326b8d6694993c39e /sql/sql_sort.h | |
| parent | 9983582a6ab55caf9944d78d857cfdbbd64156d8 (diff) | |
| download | mariadb-git-10.5-mdev22303.tar.gz | |
Changed Sort_param::tmp_buffer from char* to String10.5-mdev22303
Diffstat (limited to 'sql/sql_sort.h')
| -rw-r--r-- | sql/sql_sort.h | 3 |
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); |