diff options
| author | unknown <ramil@mysql.com> | 2005-10-24 16:45:27 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-10-24 16:45:27 +0500 |
| commit | e19b7f199d8656db1aee84ad172cf47e6f83da5b (patch) | |
| tree | d7cf1e85c2f968c39cb42aca98bf55c76b319caf /sql/sql_show.cc | |
| parent | d29ecd5e91adf6eaeb4f2afef0db30648fe08065 (diff) | |
| download | mariadb-git-e19b7f199d8656db1aee84ad172cf47e6f83da5b.tar.gz | |
a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH).
sql/sql_show.cc:
a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH).
Interchange of CHARACTER_MAXIMUM_LENGTH and CHARACTER_OCTET_LENGTH.
Diffstat (limited to 'sql/sql_show.cc')
| -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(); } |