summaryrefslogtreecommitdiff
path: root/sql/structs.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-03-02 15:03:20 -0800
committerIgor Babaev <igor@askmonty.org>2012-03-02 15:03:20 -0800
commit8bc5045ea377f39701f421cc7ae00756f79962d2 (patch)
tree751d8bbe4d3844ab9dc16d0c07855e40028cbabc /sql/structs.h
parent8b469eb5151cb1b7da00cee3a7b42c10bd7ff51e (diff)
parent2521ac0c7f2450d588fa1704a6eef785da8812a9 (diff)
downloadmariadb-git-8bc5045ea377f39701f421cc7ae00756f79962d2.tar.gz
Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.
Diffstat (limited to 'sql/structs.h')
-rw-r--r--sql/structs.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/structs.h b/sql/structs.h
index 8aeb41f7a1e..ae71819ae09 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -90,6 +90,9 @@ typedef struct st_key {
ulong flags; /* dupp key and pack flags */
uint key_parts; /* How many key_parts */
uint usable_key_parts; /* Should normally be = key_parts */
+ uint ext_key_parts; /* Number of key parts in extended key */
+ ulong ext_key_flags; /* Flags for extended key */
+ key_part_map ext_key_part_map; /* Bitmap of pk key parts in extension */
uint block_size;
uint name_length;
enum ha_key_alg algorithm;