[Commits] Rev 2875: Backport of: in file:///home/psergey/dev2/5.3-fix-subq/

Sergey Petrunya psergey at askmonty.org
Fri Jan 14 11:55:06 EET 2011


At file:///home/psergey/dev2/5.3-fix-subq/

------------------------------------------------------------
revno: 2875
revision-id: psergey at askmonty.org-20110114095503-rw0dhl0ig7x6vgw3
parent: psergey at askmonty.org-20110113214703-a2edjfk75wjq36hx
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: 5.3-fix-subq
timestamp: Fri 2011-01-14 12:55:03 +0300
message:
  Backport of:
  3723 oystein.grovlen at sun.com   2009-11-23
  Bug#46548 (addendum)
  Remove KEY::extra_length.  It is not in use.
=== modified file 'sql/structs.h'
--- a/sql/structs.h	2010-06-26 10:05:41 +0000
+++ b/sql/structs.h	2011-01-14 09:55:03 +0000
@@ -75,7 +75,6 @@
   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;
   uint  name_length;

=== modified file 'sql/table.cc'
--- a/sql/table.cc	2010-12-06 08:25:44 +0000
+++ b/sql/table.cc	2011-01-14 09:55:03 +0000
@@ -1493,7 +1493,6 @@
           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 ||
@@ -1505,7 +1504,6 @@
             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;
         }



More information about the commits mailing list