bzr commit into mysql-6.0-codebase-bugfixing branch (oystein.grovlen:3723) Bug#46548

[Oystein.Grovlen]

#At file:///home/oysteing/mysql/mysql-6.0-codebase-bugfixing-3/ based on revid:oystein.grovlen@stripped

 3723 oystein.grovlen@stripped	2009-11-23
      Bug#46548 (addendum)
      Remove KEY::extra_length.  It is not in use.
     @ sql/structs.h
        Remove KEY::extra_length.  It is not in use.
     @ sql/table.cc
        Remove KEY::extra_length.  It is not in use.

    modified:
      sql/structs.h
      sql/table.cc
=== modified file 'sql/structs.h'
--- a/sql/structs.h	2009-11-09 10:27:46 +0000
+++ b/sql/structs.h	2009-11-23 13:05:22 +0000
@@ -80,7 +80,6 @@ typedef struct st_key {
   uint	key_length;			/* Tot length of key */
   ulong flags;                          /* dupp key and pack flags */
   uint	key_parts;			/* How many key_parts */
-  uint  extra_length;
   uint	usable_key_parts;		/* Should normally be = key_parts */
   uint  block_size;
   enum  ha_key_alg algorithm;

=== modified file 'sql/table.cc'
--- a/sql/table.cc	2009-11-23 09:55:20 +0000
+++ b/sql/table.cc	2009-11-23 13:05:22 +0000
@@ -1524,7 +1524,6 @@ static int open_binary_frm(THD *thd, TAB
           key_part->null_bit= field->null_bit;
           key_part->store_length+=HA_KEY_NULL_LENGTH;
           keyinfo->flags|=HA_NULL_PART_KEY;
-          keyinfo->extra_length+= HA_KEY_NULL_LENGTH;
           keyinfo->key_length+= HA_KEY_NULL_LENGTH;
         }
         if (field->type() == MYSQL_TYPE_BLOB ||
@@ -1536,7 +1535,6 @@ static int open_binary_frm(THD *thd, TAB
             key_part->key_part_flag|= HA_BLOB_PART;
           else
             key_part->key_part_flag|= HA_VAR_LENGTH_PART;
-          keyinfo->extra_length+=HA_KEY_BLOB_LENGTH;
           key_part->store_length+=HA_KEY_BLOB_LENGTH;
           keyinfo->key_length+= HA_KEY_BLOB_LENGTH;
           /*


Attachment: [text/bzr-bundle]