diff options
| author | ramil@mysql.com <> | 2005-10-25 16:06:46 +0500 |
|---|---|---|
| committer | ramil@mysql.com <> | 2005-10-25 16:06:46 +0500 |
| commit | c88f0e9c198793c597d0281566fbbc6be2ab63db (patch) | |
| tree | dfc7ae9c6198cf05a672b867065559439a02dbdb | |
| parent | 3e9f3c32055b5b486d8032beb1071aa8fcdd37a1 (diff) | |
| parent | 02c0fe62d8d9ff8b728b8f79504aa1c8d0c81d52 (diff) | |
| download | mariadb-git-c88f0e9c198793c597d0281566fbbc6be2ab63db.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b14207
| -rw-r--r-- | sql/sql_show.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index e1d3c7d6d33..69b824f8cd9 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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(); } |