diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-16 14:05:45 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-16 14:05:45 +0300 |
| commit | f458e198c0bea67c6a3787738108bbfb139639bd (patch) | |
| tree | e01d8c096a63bacfb5895de6e55d011d666e9d38 /sql/structs.h | |
| parent | 8c5e18c9cfde61197a9f653efa08450ae9a6ce0a (diff) | |
| parent | 19f0d6b2d9930f83688943b8f98a8b7397584df9 (diff) | |
| download | mariadb-git-f458e198c0bea67c6a3787738108bbfb139639bd.tar.gz | |
Merge with 5.2
Diffstat (limited to 'sql/structs.h')
| -rw-r--r-- | sql/structs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/structs.h b/sql/structs.h index 86d1f12424e..29ccde3fb03 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -70,6 +70,7 @@ typedef struct st_key_part_info { /* Info about a key part */ } KEY_PART_INFO ; class engine_option_value; +struct ha_index_option_struct; typedef struct st_key { uint key_length; /* Tot length of key */ @@ -104,7 +105,7 @@ typedef struct st_key { struct st_table *table; /** reference to the list of options or NULL */ engine_option_value *option_list; - void *option_struct; /* structure with parsed options */ + ha_index_option_struct *option_struct; /* structure with parsed options */ } KEY; |