diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 99d0c7a..8e11fca 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -4687,8 +4748,11 @@ mysql_prepare_create_table(THD *thd, const char *error_schema_name,
       my_error(ER_WRONG_NAME_FOR_INDEX, MYF(0), key_info->name);
       DBUG_RETURN(TRUE);
     }
-    if (!(key_info->flags & HA_NULL_PART_KEY))
+    if (!(key_info->flags & HA_NULL_PART_KEY) && (key_info->flags & HA_NOSAME))
+    {
       unique_key=1;
+      
+    }
     key_info->key_length=(uint16) key_length;
     if (key_length > max_key_length && key->type != KEYTYPE_FULLTEXT)
     {