bk commit into 5.0 tree (gluh:1.1949) BUG#14271

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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.1949 05/10/28 17:13:47 gluh@stripped +3 -0
  Fix for bug#14271 I_S: columns has no size for (var)binary columns
    set character_octet_length, character_maximum_length for
    binary and varbinary field types

  sql/sql_show.cc
    1.296 05/10/28 17:09:28 gluh@stripped +3 -1
    Fix for bug#14271 I_S: columns has no size for (var)binary columns
      set character_octet_length, character_maximum_length for
      binary and varbinary field types

  mysql-test/t/information_schema.test
    1.62 05/10/28 17:09:28 gluh@stripped +8 -0
    Fix for bug#14271 I_S: columns has no size for (var)binary columns
      test case

  mysql-test/r/information_schema.result
    1.87 05/10/28 17:09:28 gluh@stripped +7 -0
    Fix for bug#14271 I_S: columns has no size for (var)binary columns
      test result

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/5.0.14271

--- 1.295/sql/sql_show.cc	Tue Oct 25 17:22:44 2005
+++ 1.296/sql/sql_show.cc	Fri Oct 28 17:09:28 2005
@@ -2557,7 +2557,9 @@
     table->field[6]->store((const char*) pos,
                            strlen((const char*) pos), cs);
     is_blob= (field->type() == FIELD_TYPE_BLOB);
-    if (field->has_charset() || is_blob)
+    if (field->has_charset() || is_blob ||
+        field->real_type() == MYSQL_TYPE_VARCHAR ||  // For varbinary type
+        field->real_type() == MYSQL_TYPE_STRING)     // For binary type
     {
       longlong char_max_len= is_blob ? 
         (longlong) field->max_length() / field->charset()->mbminlen :

--- 1.86/mysql-test/r/information_schema.result	Tue Oct 25 17:22:43 2005
+++ 1.87/mysql-test/r/information_schema.result	Fri Oct 28 17:09:28 2005
@@ -1033,3 +1033,10 @@
 text	65535	65535
 text	65535	32767
 drop table t1;
+create table t1(f1 binary(32), f2 varbinary(64));
+select character_maximum_length, character_octet_length
+from information_schema.columns where table_name='t1';
+character_maximum_length	character_octet_length
+32	32
+64	64
+drop table t1;

--- 1.61/mysql-test/t/information_schema.test	Tue Oct 25 17:22:44 2005
+++ 1.62/mysql-test/t/information_schema.test	Fri Oct 28 17:09:28 2005
@@ -736,3 +736,11 @@
 select data_type, character_octet_length, character_maximum_length 
   from information_schema.columns where table_name='t1';
 drop table t1;
+
+#
+# Bug#14271 I_S: columns has no size for (var)binary columns
+#
+create table t1(f1 binary(32), f2 varbinary(64));
+select character_maximum_length, character_octet_length
+from information_schema.columns where table_name='t1';
+drop table t1;