merge

configure.in:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

1 files changed, 6 insertions, 7 deletions

diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 06e81bd58de..1d4bdffeb61 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -889,6 +889,12 @@ store_create_info(THD *thd, TABLE *table, String *packet)
     packet->append(" CHECKSUM=1", 11);
   if (table->db_create_options & HA_OPTION_DELAY_KEY_WRITE)
     packet->append(" DELAY_KEY_WRITE=1",18);
+  if (table->comment && table->comment[0])
+  {
+    packet->append(" COMMENT='", 10);
+    append_unescaped(packet, table->comment);
+    packet->append('\'');
+  }
   if (file->raid_type)
   {
     char buff[100];
@@ -896,13 +902,6 @@ store_create_info(THD *thd, TABLE *table, String *packet)
             my_raid_type(file->raid_type), file->raid_chunks, file->raid_chunksize/RAID_BLOCK_SIZE);
     packet->append(buff);
   }
-  if(table->comment)
-  {
-    packet->append(" COMMENT='", 10);
-    append_unescaped(packet, table->comment);
-    packet->append('\'');
-  }
-
   DBUG_RETURN(0);
 }