diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-09 17:54:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-11 23:25:20 +0100 |
| commit | ca28d9011cd57cdf8af7072a3bd8219054ae1191 (patch) | |
| tree | 829191da211735ea4dde20d40f874afdf3204da7 /sql/sql_show.cc | |
| parent | f560c1ba429e6fd1f1a8df8babed88c99f8d2952 (diff) | |
| download | mariadb-git-ca28d9011cd57cdf8af7072a3bd8219054ae1191.tar.gz | |
MDEV-7655 SHOW CREATE TABLE returns invalid DDL when using virtual columns along with a table collation
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 45bddc24820..af941c350e7 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1611,7 +1611,7 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, For string types dump collation name only if collation is not primary for the given charset */ - if (!(field->charset()->state & MY_CS_PRIMARY)) + if (!(field->charset()->state & MY_CS_PRIMARY) && !field->vcol_info) { packet->append(STRING_WITH_LEN(" COLLATE ")); packet->append(field->charset()->name); |