summaryrefslogtreecommitdiff
path: root/sql/sql_partition.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-05-10 17:20:26 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-05-10 17:20:26 +0300
commit712f2d3833a9f5aa35b8171350a4414e709d509c (patch)
treededfe71cc0ebd78c6ac5ec49fb9a366ff76a4bf1 /sql/sql_partition.cc
parent6ed5d97801c983fea358c8ad95ef2a23d047efc7 (diff)
parent2b9c0451f796e3c6a1da78c6d385fe3ddf27e9b9 (diff)
downloadmariadb-git-712f2d3833a9f5aa35b8171350a4414e709d509c.tar.gz
weave merge of mysql-5.5->mysql-5.5-security
Diffstat (limited to 'sql/sql_partition.cc')
-rw-r--r--sql/sql_partition.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index b9bbec63e7d..52d6757b03a 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -3980,7 +3980,7 @@ void get_partition_set(const TABLE *table, uchar *buf, const uint index,
part_spec->start_part= 0;
part_spec->end_part= num_parts - 1;
if ((index < MAX_KEY) &&
- key_spec->flag == (uint)HA_READ_KEY_EXACT &&
+ key_spec && key_spec->flag == (uint)HA_READ_KEY_EXACT &&
part_info->some_fields_in_PF.is_set(index))
{
key_info= table->key_info+index;