Commit ea14fa9a authored by unknown's avatar unknown
Browse files

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
parents bdf18f43 80abbcd0

sql/sql_show.cc

+10 −5
Original line number Diff line number Diff line
@@ -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)

mysql-test/r/alter_table.result

+2 −2

File changed.

Contains only whitespace changes.

mysql-test/r/gis-rtree.result

+2 −2

File changed.

Contains only whitespace changes.

mysql-test/r/partition_range.result

+4 −4

File changed.

Contains only whitespace changes.

mysql-test/r/create.result

+7 −7

File changed.

Contains only whitespace changes.

mysql-test/r/index_merge_innodb.result

+1 −1

File changed.

Contains only whitespace changes.

mysql-test/r/information_schema.result

+1 −1

File changed.

Contains only whitespace changes.

mysql-test/r/merge.result

+3 −3

File changed.

Contains only whitespace changes.

mysql-test/r/strict.result

+2 −2

File changed.

Contains only whitespace changes.

mysql-test/r/system_mysql_db.result

+9 −9

File changed.

Contains only whitespace changes.

mysql-test/r/ctype_tis620.result

+1 −1

File changed.

Contains only whitespace changes.

mysql-test/r/innodb.result

+3 −3

File changed.

Contains only whitespace changes.

mysql-test/r/key.result

+1 −1

File changed.

Contains only whitespace changes.

mysql-test/r/rpl_mixed_ddl_dml.result

+1 −1

File changed.

Contains only whitespace changes.

mysql-test/r/rpl_multi_engine.result

+12 −12

File changed.

Contains only whitespace changes.

mysql-test/r/show_check.result

+3 −3

File changed.

Contains only whitespace changes.

mysql-test/r/sql_mode.result

+8 −8

File changed.

Contains only whitespace changes.

mysql-test/r/type_blob.result

+1 −1

File changed.

Contains only whitespace changes.

mysql-test/r/archive_bitfield.result

+1 −1

File changed.

Contains only whitespace changes.

mysql-test/r/partition.result

+1 −1

File changed.

Contains only whitespace changes.

mysql-test/r/symlink.result

+3 −3

File changed.

Contains only whitespace changes.