diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-16 20:17:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-16 20:17:12 +0300 |
| commit | 03c09837fc26822ba2332d9acc3e652b8d010d4c (patch) | |
| tree | e03ceb8bd6282ab144446b9f5f7fb66188b25daa /client | |
| parent | ea52a3eb9795f1ae04a4f9c2be4c81e43dc86c15 (diff) | |
| parent | c430aa72abbdccb1ece7f0d65b49a6b48e7c5ba7 (diff) | |
| download | mariadb-git-03c09837fc26822ba2332d9acc3e652b8d010d4c.tar.gz | |
Merge 10.5 into 10.6
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 d22a3d49b16..d66b7706f16 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3577,6 +3577,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" @@ -3588,8 +3589,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() ? ")" : "", |