Merge mysql.com:/home/jimw/my/mysql-5.1-13883

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/create.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/rpl_mixed_ddl_dml.result:
  Auto merged

sql/sql_show.cc

@@ -1058,14 +1058,19 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
     if (i == primary_key && !strcmp(key_info->name, primary_key_name))
     {
       found_primary=1;
-      packet->append(STRING_WITH_LEN("PRIMARY "));
+      /*
+        No space at end, because a space will be added after where the
+        identifier would go, but that is not added for primary key.
+      */
+      packet->append(STRING_WITH_LEN("PRIMARY KEY"));
     }
     else if (key_info->flags & HA_NOSAME)
-      packet->append(STRING_WITH_LEN("UNIQUE "));
+      packet->append(STRING_WITH_LEN("UNIQUE KEY "));
     else if (key_info->flags & HA_FULLTEXT)
-      packet->append(STRING_WITH_LEN("FULLTEXT "));
+      packet->append(STRING_WITH_LEN("FULLTEXT KEY "));
     else if (key_info->flags & HA_SPATIAL)
-      packet->append(STRING_WITH_LEN("SPATIAL "));
+      packet->append(STRING_WITH_LEN("SPATIAL KEY "));
+    else
       packet->append(STRING_WITH_LEN("KEY "));
 
     if (!found_primary)