diff options
| author | unknown <ramil@mysql.com> | 2005-10-25 16:06:46 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-10-25 16:06:46 +0500 |
| commit | abd77bc56397c1522f2b729334f877f9806dafd2 (patch) | |
| tree | dfc7ae9c6198cf05a672b867065559439a02dbdb /sql | |
| parent | 10a889a577e1a09f29922ba20d7e8ad96449bb04 (diff) | |
| parent | e19b7f199d8656db1aee84ad172cf47e6f83da5b (diff) | |
| download | mariadb-git-abd77bc56397c1522f2b729334f877f9806dafd2.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b14207
Diffstat (limited to 'sql')
| -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(); } |