diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-06-12 10:45:54 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-06-12 10:55:53 +0300 |
| commit | 2fd2fd77e70ed78fe8f9fc7cf99f2ebf5c2a1eef (patch) | |
| tree | 032a1775844b540dcb5044fd0d094338caeb243b /sql/uniques.h | |
| parent | 8c67ffffe827ce07fbe55ba0fb89b82cdd9152dc (diff) | |
| download | mariadb-git-2fd2fd77e70ed78fe8f9fc7cf99f2ebf5c2a1eef.tar.gz | |
Fix wrong merge of commit d218d1aa49e848cef2bdbe83bbaf08e474d5209c
Diffstat (limited to 'sql/uniques.h')
| -rw-r--r-- | sql/uniques.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/uniques.h b/sql/uniques.h index 7cdf6607dd0..a4f5b378fb0 100644 --- a/sql/uniques.h +++ b/sql/uniques.h @@ -85,6 +85,9 @@ public: { size_t 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)); } |