Change of internal key_field=NULL handling to avoid error messages.

Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index d1f99604959..a18c0178b5d 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1029,7 +1029,7 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part,
       field->cmp_type() != value->result_type())
     DBUG_RETURN(0);
 
-  if (value->save_in_field(field))
+  if (value->save_in_field(field, 1))
   {
     /* This happens when we try to insert a NULL field in a not null column */
     // TODO; Check if we can we remove the following block.
@@ -1038,9 +1038,9 @@ get_mm_leaf(PARAM *param, Field *field, KEY_PART *key_part,
       /* convert column_name <=> NULL -> column_name IS NULL */
       // Get local copy of key
       char *str= (char*) alloc_root(param->mem_root,1);
-      if (!*str)
+      if (!str)
 	DBUG_RETURN(0);
-      *str = 1;
+      *str= 1;
       DBUG_RETURN(new SEL_ARG(field,str,str));
     }
     DBUG_RETURN(&null_element);			// cmp with NULL is never true