Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/partition_info.cc:
  manual merge

2 files changed, 39 insertions, 22 deletions

diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 59cedc884b6..8ebc8e871a7 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -569,7 +569,6 @@ bool partition_info::check_list_constants()
   uint i;
   uint list_index= 0;
   longlong *list_value;
-  bool not_first;
   bool result= TRUE;
   longlong curr_value, prev_value;
   partition_element* part_def;
@@ -614,7 +613,8 @@ bool partition_info::check_list_constants()
       no_list_values++;
   } while (++i < no_parts);
   list_func_it.rewind();
-  list_array= (LIST_PART_ENTRY*)sql_alloc(no_list_values*sizeof(LIST_PART_ENTRY));
+  list_array= (LIST_PART_ENTRY*)sql_alloc((no_list_values+1) *
+                                          sizeof(LIST_PART_ENTRY));
   if (unlikely(list_array == NULL))
   {
     mem_alloc_error(no_list_values * sizeof(LIST_PART_ENTRY));
@@ -633,24 +633,28 @@ bool partition_info::check_list_constants()
     }
   } while (++i < no_parts);
 
-  qsort((void*)list_array, no_list_values, sizeof(LIST_PART_ENTRY), 
-        &list_part_cmp);
-
-  not_first= FALSE;
-  prev_value= 0; // prev_value initialised to quiet compiler
-  for (i= 0; i < no_list_values ; i++)
+  if (no_list_values)
   {
-    curr_value= list_array[i].list_value;
-    if (likely(!not_first || prev_value != curr_value))
-    {
-      prev_value= curr_value;
-      not_first= TRUE;
-    }
-    else
+    bool first= TRUE;
+    qsort((void*)list_array, no_list_values, sizeof(LIST_PART_ENTRY), 
+          &list_part_cmp);
+ 
+    i= prev_value= 0; //prev_value initialised to quiet compiler
+    do
     {
-      my_error(ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR, MYF(0));
-      goto end;
-    }
+      DBUG_ASSERT(i < no_list_values);
+      curr_value= list_array[i].list_value;
+      if (likely(first || prev_value != curr_value))
+      {
+        prev_value= curr_value;
+        first= FALSE;
+      }
+      else
+      {
+        my_error(ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR, MYF(0));
+        goto end;
+      }
+    } while (++i < no_list_values);
   }
   result= FALSE;
 end:
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index db69fd3daef..4f39a6b3f5d 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -2263,8 +2263,8 @@ static uint32 get_part_id_linear_key(partition_info *part_info,
 
 
 int get_partition_id_list(partition_info *part_info,
-                           uint32 *part_id,
-                           longlong *func_value)
+                          uint32 *part_id,
+                          longlong *func_value)
 {
   LIST_PART_ENTRY *list_array= part_info->list_array;
   int list_index;
@@ -2357,7 +2357,8 @@ uint32 get_list_array_idx_for_endpoint(partition_info *part_info,
   uint min_list_index= 0, max_list_index= part_info->no_list_values - 1;
   /* Get the partitioning function value for the endpoint */
   longlong part_func_value= part_val_int(part_info->part_expr);
-  while (max_list_index >= min_list_index)
+  DBUG_ASSERT(part_info->no_list_values);
+  do
   {
     list_index= (max_list_index + min_list_index) >> 1;
     list_value= list_array[list_index].list_value;
@@ -2373,7 +2374,7 @@ uint32 get_list_array_idx_for_endpoint(partition_info *part_info,
     {
       DBUG_RETURN(list_index + test(left_endpoint ^ include_endpoint));
     }
-  }
+  } while (max_list_index >= min_list_index);
 notfound:
   if (list_value < part_func_value)
     list_index++;
@@ -6305,6 +6306,18 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
     part_iter->get_next= get_next_partition_id_list;
     part_iter->part_info= part_info;
     part_iter->ret_null_part= part_iter->ret_null_part_orig= FALSE;
+    if (max_endpoint_val == 0)
+    {
+      /*
+        We handle this special case without optimisations since it is
+        of little practical value but causes a great number of complex
+        checks later in the code.
+      */
+      part_iter->part_nums.start= part_iter->part_nums.end= 0;
+      part_iter->part_nums.cur= 0;
+      part_iter->ret_null_part= part_iter->ret_null_part_orig= TRUE;
+      return -1;
+    }
   }
   else
     DBUG_ASSERT(0);