From: Date: October 24 2005 1:45pm
Subject: bk commit into 5.0 tree (ramil:1.2028) BUG#14207
List-Archive: http://lists.mysql.com/internals/31376
X-Bug: 14207
Message-Id: <200510241145.j9OBjZg8056421@myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2028 05/10/24 16:45:27 ramil@stripped +1 -0
  a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH).

  sql/sql_show.cc
    1.294 05/10/24 16:45:08 ramil@stripped +3 -3
    a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH).
    Interchange of CHARACTER_MAXIMUM_LENGTH and CHARACTER_OCTET_LENGTH.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/5.0.b14207

--- 1.293/sql/sql_show.cc	2005-10-18 17:22:59 +05:00
+++ 1.294/sql/sql_show.cc	2005-10-24 16:45:08 +05:00
@@ -2559,11 +2559,11 @@
     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();
     }