diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 3 | ||||
| -rw-r--r-- | client/mysqltest.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 31f563d4116..fe6af909a5a 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -425,8 +425,9 @@ int main(int argc,char *argv[]) } #endif sprintf(buff, "%s", +#ifndef NOT_YET "Type 'help;' or '\\h' for help. Type '\\c' to clear the buffer.\n"); -#ifdef NOT_YET +#else "Type 'help [[%]function name[%]]' to get help on usage of function.\n"); #endif put_info(buff,INFO_INFO); 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); } } |