Commit abd77bc5 authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/usr/home/ram/work/5.0.b14207
parents 10a889a5 e19b7f19

sql/sql_show.cc

+3 −3
Original line number Diff line number Diff line
@@ -2559,11 +2559,11 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables, 
    is_blob= (field->type() == FIELD_TYPE_BLOB);

    if (field->has_charset() || is_blob)

    {

      longlong c_octet_len= is_blob ? (longlong) field->max_length() :

      longlong char_max_len= is_blob ? (longlong) field->max_length() :

        (longlong) field->max_length()/field->charset()->mbmaxlen;

      table->field[8]->store((longlong) field->max_length(), TRUE);

      table->field[8]->store(char_max_len, TRUE);

      table->field[8]->set_notnull();

      table->field[9]->store(c_octet_len, TRUE);

      table->field[9]->store((longlong) field->max_length(), TRUE);

      table->field[9]->set_notnull();

    }