Commit 73c1453e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/bar/mysql-4.1 

into  mysql.com:/usr/home/bar/mysql-4.1.b17939


client/mysql.cc:
  Auto merged
parents bfdbb780 ca9c4793

client/mysql.cc

+7 −2
Original line number Diff line number Diff line
@@ -2154,7 +2154,12 @@ print_table_data(MYSQL_RES *result) 
    (void) tee_fputs("|", PAGER);

    for (uint off=0; (field = mysql_fetch_field(result)) ; off++)

    {

      tee_fprintf(PAGER, " %-*s|",(int) min(field->max_length,

      uint name_length= (uint) strlen(field->name);

      uint numcells= charset_info->cset->numcells(charset_info,

                                                  field->name,

                                                  field->name + name_length);

      uint display_length= field->max_length + name_length - numcells;

      tee_fprintf(PAGER, " %-*s|",(int) min(display_length,

                                            MAX_COLUMN_LENGTH),

                  field->name);

      num_flag[off]= IS_NUM(field->type);