diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-03-06 11:39:36 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-03-06 11:39:36 +0100 |
| commit | ccd2742f8ed63eaadccc680b02dfc528a43e5f70 (patch) | |
| tree | ebd1254d595b663b63a532cd1207e1e87802aa4c /sql/sql_show.cc | |
| parent | fa1775b6b05eefa7e03edc75f9e3c501850db489 (diff) | |
| parent | 31a7a0d64652c651c201f0c176f1401992d1714e (diff) | |
| download | mariadb-git-ccd2742f8ed63eaadccc680b02dfc528a43e5f70.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/binary.result:
Auto merged
mysql-test/r/case.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/events.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_02myisam.result:
Auto merged
mysql-test/r/partition_mgm_err.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/archive_gis.result:
Merge bug10460
mysql-test/r/bdb_gis.result:
Merge bug10460
mysql-test/r/func_system.result:
Merge bug10460
mysql-test/r/innodb_gis.result:
Merge bug10460
mysql-test/r/ndb_gis.result:
Merge bug10460
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 9e41c541c4f..13f880ef228 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -966,7 +966,7 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, { if (field->charset() != share->table_charset) { - packet->append(STRING_WITH_LEN(" character set ")); + packet->append(STRING_WITH_LEN(" CHARACTER SET ")); packet->append(field->charset()->csname); } /* @@ -975,7 +975,7 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, */ if (!(field->charset()->state & MY_CS_PRIMARY)) { - packet->append(STRING_WITH_LEN(" collate ")); + packet->append(STRING_WITH_LEN(" COLLATE ")); packet->append(field->charset()->name); } } @@ -1006,7 +1006,7 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, if (has_default) { - packet->append(STRING_WITH_LEN(" default ")); + packet->append(STRING_WITH_LEN(" DEFAULT ")); if (has_now_default) packet->append(STRING_WITH_LEN("CURRENT_TIMESTAMP")); else if (!field->is_null()) @@ -1034,11 +1034,11 @@ store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, if (!(thd->variables.sql_mode & MODE_NO_FIELD_OPTIONS) && table->timestamp_field == field && field->unireg_check != Field::TIMESTAMP_DN_FIELD) - packet->append(STRING_WITH_LEN(" on update CURRENT_TIMESTAMP")); + packet->append(STRING_WITH_LEN(" ON UPDATE CURRENT_TIMESTAMP")); if (field->unireg_check == Field::NEXT_NUMBER && !(thd->variables.sql_mode & MODE_NO_FIELD_OPTIONS)) - packet->append(STRING_WITH_LEN(" auto_increment")); + packet->append(STRING_WITH_LEN(" AUTO_INCREMENT")); if (field->comment.length) { |