diff options
| author | Varun Gupta <varun.gupta@mariadb.com> | 2020-06-05 13:11:33 +0530 |
|---|---|---|
| committer | Varun Gupta <varun.gupta@mariadb.com> | 2020-06-07 04:19:58 +0530 |
| commit | d218d1aa49e848cef2bdbe83bbaf08e474d5209c (patch) | |
| tree | 408ad20dcf0b7273a8723dc6c44e3fb4f58810ec /sql/sql_class.h | |
| parent | f30ff10c8d02d8385bafa290b8c73367d49aece2 (diff) | |
| download | mariadb-git-d218d1aa49e848cef2bdbe83bbaf08e474d5209c.tar.gz | |
MDEV-22728: SIGFPE in Unique::get_cost_calc_buff_size from prepare_search_best_index_intersect on optimized builds
For low sort_buffer_size, in the cost calculation of using the Unique object the elements in the tree were evaluated to 0, make sure to have atleast 1 element in the Unique tree.
Also for the function Unique::get allocate memory for atleast MERGEBUFF2+1 keys.
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 9071a2db516..7ca3896a69d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -5216,6 +5216,9 @@ public: { ulonglong max_elems_in_tree= max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size); + + if (max_elems_in_tree == 0) + max_elems_in_tree= 1; return (int) (sizeof(uint)*(1 + nkeys/max_elems_in_tree)); } |