diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:43:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:43:36 +0200 |
| commit | 13038e4705ed55e24362dfad977a1ee454cfebfd (patch) | |
| tree | ac3d37fe69e802dec8008748b86cc901f116eead /sql/handler.h | |
| parent | 72c7b4eb4cc86ca2f6bdb9e105b67d39df018a40 (diff) | |
| parent | f5844e7c4bc693783f088a5fc9c399b786ddc8c1 (diff) | |
| download | mariadb-git-13038e4705ed55e24362dfad977a1ee454cfebfd.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/handler.h b/sql/handler.h index afad986c883..0eff7bd930d 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2956,9 +2956,9 @@ public: {} }; -extern "C" enum icp_result handler_index_cond_check(void* h_arg); +extern "C" check_result_t handler_index_cond_check(void* h_arg); -extern "C" int handler_rowid_filter_check(void* h_arg); +extern "C" check_result_t handler_rowid_filter_check(void* h_arg); extern "C" int handler_rowid_filter_is_active(void* h_arg); uint calculate_key_len(TABLE *, uint, const uchar *, key_part_map); @@ -4975,7 +4975,8 @@ public: virtual void set_lock_type(enum thr_lock_type lock); - friend enum icp_result handler_index_cond_check(void* h_arg); + friend check_result_t handler_index_cond_check(void* h_arg); + friend check_result_t handler_rowid_filter_check(void *h_arg); /** Find unique record by index or unique constrain |