summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2012-08-20 12:44:40 +0200
committerMattias Jonsson <mattias.jonsson@oracle.com>2012-08-20 12:44:40 +0200
commit6c6d9b46a9c000d6a662c037d3a485158faf2eb1 (patch)
treea68c5e9c332a1b12fea756e96953ae6a31096885 /sql
parent01c62eb59b1ce5e56dcb5a8f6568e724822dd0fe (diff)
parent5d83889791c138955ec0ab61967e8d0dcdede871 (diff)
downloadmariadb-git-6c6d9b46a9c000d6a662c037d3a485158faf2eb1.tar.gz
merge
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_partition.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 7d66935c046..14b89bf0dc8 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -4194,7 +4194,7 @@ bool ha_partition::init_record_priority_queue()
*/
if (!m_ordered_rec_buffer)
{
- uint map_len, alloc_len;
+ uint alloc_len;
uint used_parts= bitmap_bits_set(&m_part_info->used_partitions);
/* Allocate record buffer for each used partition. */
alloc_len= used_parts * (m_rec_length + PARTITION_BYTES_IN_POS);