diff options
| author | unknown <ramil@mysql.com> | 2005-10-25 17:22:58 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-10-25 17:22:58 +0500 |
| commit | 48765db2e5981488ac97cb6b40ffc1df41b7d2d4 (patch) | |
| tree | d1bbe2ceb5a3b0d6e932f94f8353f8274e6d5f95 /sql/sql_show.cc | |
| parent | abd77bc56397c1522f2b729334f877f9806dafd2 (diff) | |
| download | mariadb-git-48765db2e5981488ac97cb6b40ffc1df41b7d2d4.tar.gz | |
Fix for bug #14290: wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.
sql/sql_show.cc:
Fix for bug #14290: wrong CHARACTER_MAXIMUM_LENGTH value for some text fields.
adjust CHARACTER_MAXIMUM_LENGTH value for text fields.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 69b824f8cd9..72bb8cdb4cf 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2559,8 +2559,9 @@ 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 char_max_len= is_blob ? (longlong) field->max_length() : - (longlong) field->max_length()/field->charset()->mbmaxlen; + longlong char_max_len= is_blob ? + (longlong) field->max_length() / field->charset()->mbminlen : + (longlong) field->max_length() / field->charset()->mbmaxlen; table->field[8]->store(char_max_len, TRUE); table->field[8]->set_notnull(); table->field[9]->store((longlong) field->max_length(), TRUE); |