diff options
author | Tor Didriksen <tor.didriksen@oracle.com> | 2013-11-01 16:39:19 +0100 |
---|---|---|
committer | Tor Didriksen <tor.didriksen@oracle.com> | 2013-11-01 16:39:19 +0100 |
commit | c4fb8f0cfe83e89f995fc101b0b9c78f2135785f (patch) | |
tree | 96ae5e4094c90d7cd779ad752e1e095854b0fd2a | |
parent | c866c5a456e39f79ba873d0675f59c24f2c1ca98 (diff) | |
download | mariadb-git-c4fb8f0cfe83e89f995fc101b0b9c78f2135785f.tar.gz |
Bug#17617945 BUFFER OVERFLOW IN GET_MERGE_MANY_BUFFS_COST WITH SMALL SORT_BUFFER_SIZEmysql-5.1.73clone-5.1.73-build
get_cost_calc_buff_size() could return wrong value for the size of imerge_cost_buff.
-rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 9a9b2058e2b..fd83930a8e9 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2987,11 +2987,13 @@ public: bool get(TABLE *table); static double get_use_cost(uint *buffer, uint nkeys, uint key_size, ulonglong max_in_memory_size); + + // Returns the number of bytes needed in imerge_cost_buf. inline static int get_cost_calc_buff_size(ulong nkeys, uint key_size, ulonglong max_in_memory_size) { register ulonglong max_elems_in_tree= - (1 + max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size)); + (max_in_memory_size / ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size)); return (int) (sizeof(uint)*(1 + nkeys/max_elems_in_tree)); } |