From c8944add73cbcfa5c176142b23c90fd77f9f1ceb Mon Sep 17 00:00:00 2001
From: "gluh@eagle.intranet.mysql.r18.ru" <>
Date: Fri, 12 May 2006 15:09:25 +0500
Subject: Fix for bug#19236 bad COLUMNS.CHARACTER_MAXIMUM_LENGHT and
 CHARACTER_OCTET_LENGTH

---
 sql/sql_show.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_show.cc')

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 :
-- 
cgit v1.2.1