database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.4' into 10.5

Browse Source
This commit is contained in:
Sergei Golubchik
2020-05-09 20:43:36 +02:00
parent 72c7b4eb4c f5844e7c4b
commit 13038e4705
100 changed files with 1571 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/handler.h
View File

@ -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