diff options
| author | gluh@eagle.intranet.mysql.r18.ru <> | 2006-05-12 15:09:25 +0500 |
|---|---|---|
| committer | gluh@eagle.intranet.mysql.r18.ru <> | 2006-05-12 15:09:25 +0500 |
| commit | c8944add73cbcfa5c176142b23c90fd77f9f1ceb (patch) | |
| tree | d06fe37be54684d6c508f7fbe61028e7c9694669 /sql/sql_show.cc | |
| parent | d1417ad55a1b1b53abdde1034ba3fd52599c8244 (diff) | |
| download | mariadb-git-c8944add73cbcfa5c176142b23c90fd77f9f1ceb.tar.gz | |
Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and CHARACTER_OCTET_LENGTH
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 126abb96f61..1484274b3dc 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2662,7 +2662,7 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables, field->real_type() == MYSQL_TYPE_STRING) // For binary type { uint32 octet_max_length= field->max_length(); - if (octet_max_length != (uint32) 4294967295U) + if (is_blob && octet_max_length != (uint32) 4294967295U) octet_max_length /= field->charset()->mbmaxlen; longlong char_max_len= is_blob ? (longlong) octet_max_length / field->charset()->mbminlen : |