bk commit into 4.1 tree (sergefp:1.2190) BUG#9439

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
4.1 repository of psergey. When psergey 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.2190 05/04/16 22:56:03 sergefp@stripped +1 -0
  Fix for BUG#9439: 
   changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as
MAX_KEY_LENGTH=1024)

  sql/sql_show.cc
    1.198 05/04/16 22:56:01 sergefp@stripped +2 -2
    Fix for BUG#9439: 
     changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as
MAX_KEY_LENGTH=1024)

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-4.1-bug9439

--- 1.197/sql/sql_show.cc	2005-03-23 21:19:09 +03:00
+++ 1.198/sql/sql_show.cc	2005-04-16 22:56:01 +04:00
@@ -980,7 +980,7 @@
   field_list.push_back(item=new Item_int("Cardinality",0,21));
   item->maybe_null=1;
   field_list.push_back(item=new Item_return_int("Sub_part",3,
-						MYSQL_TYPE_TINY));
+						MYSQL_TYPE_SHORT));
   item->maybe_null=1;
   field_list.push_back(item=new Item_empty_string("Packed",10));
   item->maybe_null=1;
@@ -1025,7 +1025,7 @@
       /* Check if we have a key part that only uses part of the field */
       if (!(key_info->flags & HA_FULLTEXT) && (!key_part->field ||
           key_part->length !=
table->field[key_part->fieldnr-1]->key_length()))
-        protocol->store_tiny((longlong) key_part->length / 
+        protocol->store_short((longlong) key_part->length / 
                              key_part->field->charset()->mbmaxlen);
       else
         protocol->store_null();