database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-08-04 17:24:15 +02:00
parent bbd70fcc43 9a156e1a23
commit 48b5777ebd
144 changed files with 3475 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_show.cc
View File

@ -2149,6 +2149,13 @@ int show_create_table_ex(THD *thd, TABLE_LIST *table_list,
append_identifier(thd, packet, &field->field_name);
packet->append(' ');
const Type_handler *th= field->type_handler();
const Schema *implied_schema= Schema::find_implied(thd);
if (th != implied_schema->map_data_type(thd, th))
{
packet->append(th->schema()->name(), system_charset_info);
packet->append(STRING_WITH_LEN("."), system_charset_info);
}
type.set(tmp, sizeof(tmp), system_charset_info);
field->sql_type(type);
packet->append(type.ptr(), type.length(), system_charset_info);