summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Blåudd <magnus.blaudd@oracle.com>2011-05-06 10:53:42 +0200
committerMagnus Blåudd <magnus.blaudd@oracle.com>2011-05-06 10:53:42 +0200
commite7aaef43335689e8b2d59817c6770b1345a5610f (patch)
tree69f51bbf5a874177e01a82d27e2450c9fb88151c
parenta4b5278ab4b4d7ac5fe63533176567bfe00e748a (diff)
downloadmariadb-git-e7aaef43335689e8b2d59817c6770b1345a5610f.tar.gz
Merge in patch for bug 12380149
-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 5c2c0bb95d6..776ce01cc54 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -3979,7 +3979,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;