mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-02 05:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.11 into 11.4

Browse source
This commit is contained in:
Marko Mäkelä 2024-12-02 11:35:34 +02:00
commit 2719cc4925
420 changed files with 6455 additions and 4165 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/sql_base.h
View file

@ -334,10 +334,9 @@ int dynamic_column_error_message(enum_dyncol_func_result rc);
/* open_and_lock_tables with optional derived handling */
int open_and_lock_tables_derived(THD *thd, TABLE_LIST *tables, bool derived);
extern "C" int simple_raw_key_cmp(void* arg, const void* key1,
const void* key2);
extern "C" qsort_cmp2 simple_raw_key_cmp;
extern "C" int count_distinct_walk(void *elem, element_count count, void *arg);
int simple_str_key_cmp(void* arg, uchar* key1, uchar* key2);
int simple_str_key_cmp(void *arg, const void *key1, const void *key2);
extern Item **not_found_item;
extern Field *not_found_field;