From ec425cc5ac4281b26ed32b29c06437950357cbb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magnus=20Bl=C3=A5udd?= <magnus.blaudd@oracle.com>
Date: Fri, 6 May 2011 10:53:42 +0200
Subject: [PATCH] Merge in patch for bug 12380149

---
 sql/sql_partition.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;