diff options
| author | Monty <monty@mariadb.org> | 2021-09-15 20:23:07 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2021-09-15 20:23:07 +0300 |
| commit | b4f24c745a42d69fca2d67ce827c30632ef4b5fc (patch) | |
| tree | d33f5e720f6beb4d544635c2e30db974508eff95 /client | |
| parent | f03fee06b0f4bdb1d754d987db3375cade02445e (diff) | |
| parent | 689b8d060ac890dcf1071b34a68234b30005e9a1 (diff) | |
| download | mariadb-git-b4f24c745a42d69fca2d67ce827c30632ef4b5fc.tar.gz | |
Merge branch '10.4' into 10.5
Fixed also an error in suite/perfschema/t/transaction_nested_events-master.opt
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 433fbd281b9..e49f7979a93 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -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() ? ")" : "", |