diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/maria.h | 3 | ||||
| -rw-r--r-- | include/my_base.h | 9 | ||||
| -rw-r--r-- | include/myisamchk.h | 5 | ||||
| -rw-r--r-- | include/thr_lock.h | 3 |
4 files changed, 16 insertions, 4 deletions
diff --git a/include/maria.h b/include/maria.h index b216affa3fc..43bafddb2ce 100644 --- a/include/maria.h +++ b/include/maria.h @@ -391,6 +391,7 @@ typedef struct st_maria_sort_param /* functions in maria_check */ void maria_chk_init(HA_CHECK *param); +void maria_chk_init_for_check(HA_CHECK *param, MARIA_HA *info); int maria_chk_status(HA_CHECK *param, MARIA_HA *info); int maria_chk_del(HA_CHECK *param, MARIA_HA *info, ulonglong test_flag); int maria_chk_size(HA_CHECK *param, MARIA_HA *info); @@ -432,6 +433,8 @@ int maria_assign_to_pagecache(MARIA_HA *info, ulonglong key_map, void maria_change_pagecache(PAGECACHE *old_key_cache, PAGECACHE *new_key_cache); int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves); +void maria_versioning(MARIA_HA *info, my_bool versioning); +void maria_ignore_trids(MARIA_HA *info); /* fulltext functions */ FT_INFO *maria_ft_init_search(uint,void *, uint, uchar *, uint, diff --git a/include/my_base.h b/include/my_base.h index ddefb5be7b4..719b7c043b4 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -440,9 +440,12 @@ enum ha_base_keytype { #define HA_ERR_INITIALIZATION 173 /* Error during initialization */ #define HA_ERR_FILE_TOO_SHORT 174 /* File too short */ #define HA_ERR_WRONG_CRC 175 /* Wrong CRC on page */ -#define HA_ERR_ROWS_EVENT_APPLY 176 /* The event could not be processed */ - /* no other hanlder error happened */ -#define HA_ERR_LAST 176 /* Copy of last error nr */ + +/* The event could not be processed; no other handler error happened */ +#define HA_ERR_ROWS_EVENT_APPLY 176 +#define HA_ERR_ROW_NOT_VISIBLE 177 + +#define HA_ERR_LAST 177 /* Copy of last error nr */ /* Number of different errors */ #define HA_ERR_ERRORS (HA_ERR_LAST - HA_ERR_FIRST + 1) diff --git a/include/myisamchk.h b/include/myisamchk.h index 29f523558aa..f4651b81f8b 100644 --- a/include/myisamchk.h +++ b/include/myisamchk.h @@ -134,6 +134,11 @@ typedef struct st_handler_check_param ha_checksum tmp_record_checksum; ulonglong org_key_map; ulonglong testflag; + + /* Following is used to check if rows are visible */ + ulonglong max_trid, max_found_trid; + ulonglong not_visible_rows_found; + size_t use_buffers, read_buffer_length, write_buffer_length; size_t sort_buffer_length, sort_key_blocks; ulong rec_per_key_part[HA_MAX_KEY_SEG * HA_MAX_POSSIBLE_KEY]; diff --git a/include/thr_lock.h b/include/thr_lock.h index a4ca6e6ddf2..821c1bf2949 100644 --- a/include/thr_lock.h +++ b/include/thr_lock.h @@ -123,11 +123,12 @@ typedef struct st_thr_lock { /* write_lock_count is incremented for write locks and reset on read locks */ ulong write_lock_count; uint read_no_write_count; - void (*get_status)(void*, int); /* When one gets a lock */ + void (*get_status)(void*, my_bool); /* When one gets a lock */ void (*copy_status)(void*,void*); void (*update_status)(void*); /* Before release of write */ void (*restore_status)(void*); /* Before release of read */ my_bool (*check_status)(void *); + my_bool allow_multiple_concurrent_insert; } THR_LOCK; |