summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/heap.h4
-rw-r--r--include/my_base.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/include/heap.h b/include/heap.h
index 9efb873ec93..02b04e2b3ec 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -78,11 +78,13 @@ typedef struct st_hp_keyseg /* Key-portion */
uint start; /* Start of key in record (from 0) */
uint length; /* Keylength */
uint type;
+ uint null_bit; /* bit set in row+null_pos */
+ uint null_pos;
} HP_KEYSEG;
typedef struct st_hp_keydef /* Key definition with open */
{
- uint flag; /* NOSAME */
+ uint flag; /* HA_NOSAME | HA_NULL_PART_KEY */
uint keysegs; /* Number of key-segment */
uint length; /* Length of key (automatic) */
HP_KEYSEG *seg;
diff --git a/include/my_base.h b/include/my_base.h
index dc88e248469..6494fa93ab9 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -68,7 +68,8 @@ enum ha_rkey_function {
enum ha_key_alg {
HA_KEY_ALG_BTREE=0, /* B-tree, default one */
- HA_KEY_ALG_RTREE=1 /* R-tree, for spatial searches */
+ HA_KEY_ALG_RTREE=1, /* R-tree, for spatial searches */
+ HA_KEY_ALG_HASH=2 /* HASH keys (HEAP tables) */
};
/* The following is parameter to ha_extra() */