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

Merge branch '10.4' into 10.5

Browse Source 
Fixed also an error in suite/perfschema/t/transaction_nested_events-master.opt
This commit is contained in:
Monty
2021-09-15 20:23:07 +03:00
parent f03fee06b0 689b8d060a
commit b4f24c745a
14 changed files with 137 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/mysql.cc
View File

@@ -3510,6 +3510,7 @@ print_field_types(MYSQL_RES *result)
BinaryStringBuffer<128> data_type_metadata_str;
metadata.print_data_type_related_attributes(&data_type_metadata_str);
tee_fprintf(PAGER, "Field %3u: `%s`\n"
"Org_field: `%s`\n"
"Catalog: `%s`\n"
"Database: `%s`\n"
"Table: `%s`\n"
@@ -3521,8 +3522,8 @@ print_field_types(MYSQL_RES *result)
"Decimals: %u\n"
"Flags: %s\n\n",
++i,
field->name, field->catalog, field->db, field->table,
field->org_table, fieldtype2str(field->type),
field->name, field->org_name, field->catalog, field->db,
field->table, field->org_table, fieldtype2str(field->type),
data_type_metadata_str.length() ? " (" : "",
data_type_metadata_str.length(), data_type_metadata_str.ptr(),
data_type_metadata_str.length() ? ")" : "",