summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <bar@bar.intranet.mysql.r18.ru>2004-04-06 19:57:33 +0500
committerunknown <bar@bar.intranet.mysql.r18.ru>2004-04-06 19:57:33 +0500
commit815c23f1e6431a6e20e8915fa92a71f7a754d5b7 (patch)
tree3410735f1e3d76f9c5c170a8f6124e69fdd8422f /client
parentae3d22668921d11c584d7cf395f60ed29cb651d1 (diff)
downloadmariadb-git-815c23f1e6431a6e20e8915fa92a71f7a754d5b7.tar.gz
Fixed charsetnr sent to the client
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 00165ab4f45..be5dac1c9d9 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -2358,7 +2358,7 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
if (display_metadata)
{
- dynstr_append(ds,"Catalog\tDatabase\tTable\tTable_alias\tColumn\tColumn_alias\tName\tType\tLength\tMax length\tIs_null\tFlags\tDecimals\n");
+ dynstr_append(ds,"Catalog\tDatabase\tTable\tTable_alias\tColumn\tColumn_alias\tName\tType\tLength\tMax length\tIs_null\tFlags\tDecimals\tCharsetnr\n");
for (field= mysql_fetch_fields(res), field_end= field+num_fields ;
field < field_end ;
field++)
@@ -2394,6 +2394,9 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags)
dynstr_append_mem(ds, "\t", 1);
int10_to_str((int) field->decimals, buff, 10);
dynstr_append(ds, buff);
+ dynstr_append_mem(ds, "\t", 1);
+ int10_to_str((int) field->charsetnr, buff, 10);
+ dynstr_append(ds, buff);
dynstr_append_mem(ds, "\n", 1);
}
}