UNIQUE keys are not anymore shown as PRIMARY KEY

Docs/manual.texi:
  Changelog
mysql-test/r/show_check.result:
  Added test for SHOW CREATE
mysql-test/t/show_check.test:
  Added test for SHOW CREATE
sql/mysqld.cc:
  Fixed messages

2 files changed, 10 insertions, 4 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 177d4ab1ab4..e11da82f43f 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1190,7 +1190,7 @@ Some pointers may be invalid and cause the dump to abort...\n");
     fprintf(stderr, "\n
 Successfully dumped variables, if you ran with --log, take a look at the\n\
 details of what thread %ld did to cause the crash.  In some cases of really\n\
-bad corruption, the above values may be invalid\n\n",
+bad corruption, the values shown above may be invalid\n\n",
 	  thd->thread_id);
   }
   fprintf(stderr, "\
@@ -3011,6 +3011,8 @@ static void usage(void)
 			Start without grant tables. This gives all users\n\
 			FULL ACCESS to all tables!\n\
   --safe-mode		Skip some optimize stages (for testing)\n\
+  --safe-show-database  Don't show databases for which the user has no\n\
+                        privileges\n\
   --skip-concurrent-insert\n\
 		        Don't use concurrent insert with MyISAM\n\
   --skip-delay-key-write\n\
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 39ddb79e9de..6f99495d94d 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -839,18 +839,22 @@ store_create_info(THD *thd, TABLE *table, String *packet)
 
   for (uint i=0 ; i < table->keys ; i++,key_info++)
   {
+    KEY_PART_INFO *key_part= key_info->key_part;
+    bool found_primary=0;
     packet->append(",\n  ", 4);
 
-    KEY_PART_INFO *key_part= key_info->key_part;
-    if (i == primary_key)
+    if (i == primary_key && !strcmp(key_info->name,"PRIMARY"))
+    {
+      found_primary=1;
       packet->append("PRIMARY ", 8);
+    }
     else if (key_info->flags & HA_NOSAME)
       packet->append("UNIQUE ", 7);
     else if (key_info->flags & HA_FULLTEXT)
       packet->append("FULLTEXT ", 9);
     packet->append("KEY ", 4);
 
-    if (i != primary_key)
+    if (!found_primary)
      append_identifier(thd,packet,key_info->name);
 
     packet->append(" (", 2);