summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-01-24 23:34:02 -0800
committerIgor Babaev <igor@askmonty.org>2012-01-24 23:34:02 -0800
commit51847a0fba6c1072b58e641cffc028838272c9ec (patch)
tree64c722b6629cd2cb0eed6a04eb90375fd69d708c /sql/table.cc
parent507e1927e103892d48568fe2c9a3d953e5ca7ad7 (diff)
downloadmariadb-git-51847a0fba6c1072b58e641cffc028838272c9ec.tar.gz
Fixed LP bug #921167.
The fields ext_key_flags and ext_key_part_map must be initialized for any key, even for a MyISAM key that never is considered by the optimizer as one extended by hidden components.
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index af7e0d1f753..318e32da2f3 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -907,6 +907,8 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
key_part->store_length=key_part->length;
}
keyinfo->ext_key_parts= keyinfo->key_parts;
+ keyinfo->ext_key_flags= keyinfo->flags;
+ keyinfo->ext_key_part_map= 0;
if (share->use_ext_keys && i)
{
keyinfo->ext_key_flags= keyinfo->flags | HA_NOSAME;