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

mysql.cc:

Browse Source 
Bug#3453: MySQL output formatting in multibyte character sets


client/mysql.cc:
  Bug#3453: MySQL output formatting in multibyte character sets
This commit is contained in:
unknown
2004-08-25 13:03:34 +05:00
parent f0fed74629
commit b20d1ce4f3
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/mysql.cc
View File

@@ -2019,21 +2019,27 @@ print_table_data(MYSQL_RES *result)
while ((cur= mysql_fetch_row(result))) while ((cur= mysql_fetch_row(result)))
{ {
ulong *lengths= mysql_fetch_lengths(result);
(void) tee_fputs("|", PAGER); (void) tee_fputs("|", PAGER);
mysql_field_seek(result, 0); mysql_field_seek(result, 0);
for (uint off= 0; off < mysql_num_fields(result); off++) for (uint off= 0; off < mysql_num_fields(result); off++)
{ {
const char *str= cur[off] ? cur[off] : "NULL"; const char *str= cur[off] ? cur[off] : "NULL";
field= mysql_fetch_field(result); field= mysql_fetch_field(result);
uint length= field->max_length; uint maxlength= field->max_length;
if (length > MAX_COLUMN_LENGTH) if (maxlength > MAX_COLUMN_LENGTH)
{ {
tee_fputs(str, PAGER); tee_fputs(str, PAGER);
tee_fputs(" |", PAGER); tee_fputs(" |", PAGER);
} }
else else
{
uint currlength= (uint) lengths[off];
uint numcells= charset_info->cset->numcells(charset_info,
str, str + currlength);
tee_fprintf(PAGER, num_flag[off] ? "%*s |" : " %-*s|", tee_fprintf(PAGER, num_flag[off] ? "%*s |" : " %-*s|",
length, str); maxlength + currlength - numcells, str);
}
} }
(void) tee_fputs("\n", PAGER); (void) tee_fputs("\n", PAGER);
} }