diff options
Diffstat (limited to 'include/maria.h')
| -rw-r--r-- | include/maria.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/maria.h b/include/maria.h index a946363c57b..a4c425ced47 100644 --- a/include/maria.h +++ b/include/maria.h @@ -145,12 +145,14 @@ typedef struct st_maria_create_info ulonglong auto_increment; ulonglong data_file_length; ulonglong key_file_length; + ulong s3_block_size; /* Size of null bitmap at start of row */ uint null_bytes; uint old_options; + uint compression_algorithm; enum data_file_type org_data_file_type; uint16 language; - my_bool with_auto_increment, transactional; + my_bool with_auto_increment, transactional, encrypted; } MARIA_CREATE_INFO; struct st_maria_share; @@ -184,6 +186,7 @@ typedef struct st_maria_keydef /* Key definition with open & info */ uint16 keylength; /* Tot length of keyparts (auto) */ uint16 minlength; /* min length of (packed) key (auto) */ uint16 maxlength; /* max length of (packed) key (auto) */ + uint16 max_store_length; /* Size to store key + overhead */ uint32 write_comp_flag; /* compare flag for write key (auto) */ uint32 version; /* For concurrent read/write */ uint32 ftkey_nr; /* full-text index number */ @@ -229,6 +232,7 @@ typedef struct st_maria_decode_tree /* Decode huff-table */ struct st_maria_bit_buff; +typedef struct s3_info S3_INFO; /* Note that null markers should always be first in a row ! @@ -285,7 +289,7 @@ extern my_bool maria_upgrade(void); extern int maria_close(MARIA_HA *file); extern int maria_delete(MARIA_HA *file, const uchar *buff); extern MARIA_HA *maria_open(const char *name, int mode, - uint wait_if_locked); + uint wait_if_locked, S3_INFO *s3); extern int maria_panic(enum ha_panic_function function); extern int maria_rfirst(MARIA_HA *file, uchar *buf, int inx); extern int maria_rkey(MARIA_HA *file, uchar *buf, int inx, @@ -320,7 +324,9 @@ extern int maria_extra(MARIA_HA *file, enum ha_extra_function function, void *extra_arg); extern int maria_reset(MARIA_HA *file); extern ha_rows maria_records_in_range(MARIA_HA *info, int inx, - key_range *min_key, key_range *max_key); + const key_range *min_key, + const key_range *max_key, + page_range *page); extern int maria_is_changed(MARIA_HA *info); extern int maria_delete_all_rows(MARIA_HA *info); extern uint maria_get_pointer_length(ulonglong file_length, uint def); |