summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <kgeorge@mysql.com>2008-11-29 15:36:17 +0200
committerGeorgi Kodinov <kgeorge@mysql.com>2008-11-29 15:36:17 +0200
commitab4d8812f46374061d314b35f1358525b279de4d (patch)
tree96b3689cd0dc7e80ac771f9f06aa4c305315a518 /sql/table.cc
parent21c1182cc5e6ba86fa2d46c5ebfc4b5559783fbf (diff)
downloadmariadb-git-ab4d8812f46374061d314b35f1358525b279de4d.tar.gz
Bug #37742: HA_EXTRA_KEYREAD flag is set when key contains only prefix of requested
column When the storage engine uses secondary keys clustered with the primary key MySQL was adding the primary key parts to each secondary key. In doing so it was not checking whether the index was on full columns and this resulted in the secondary keys being added to the list of covering keys even if they have partial columns. Fixed by not adding a primary key part to the list of columns that can be used for index read of the secondary keys when the primary key part is a partial key part. mysql-test/r/innodb_mysql.result: Bug #37742: test case mysql-test/t/innodb_mysql.test: Bug #37742: test case sql/table.cc: Bug #37742: don't add the primary key part to the list of covering key parts of a secondary key if it's a partial key part.
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 89714e4e47e..1de47a48513 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1416,7 +1416,9 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
*/
if (ha_option & HA_PRIMARY_KEY_IN_READ_INDEX)
{
- field->part_of_key= share->keys_in_use;
+ if (field->key_length() == key_part->length &&
+ !(field->flags & BLOB_FLAG))
+ field->part_of_key= share->keys_in_use;
if (field->part_of_sortkey.is_set(key))
field->part_of_sortkey= share->keys_in_use;
}