Skip to content

M
mariadb
Commit cdad081f authored by jimw@mysql.com's avatar jimw@mysql.com
Browse files
Options

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

into  mysql.com:/home/jimw/my/mysql-5.1-clean
parents bf0b7758 95f1b049
Show whitespace changes
Inline Side-by-side
Showing with 76 additions and 71 deletions
sql/sql_show.cc
View file @ cdad081f
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7