database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code 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
parent 866a8ea673 3d23adb766
commit 2719cc4925
420 changed files with 6452 additions and 4162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
sql/sql_select.cc
View File

@@ -137,7 +137,7 @@ static bool update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,
uint tables, COND *conds,
table_map table_map, SELECT_LEX *select_lex,
SARGABLE_PARAM **sargables);
static int sort_keyuse(KEYUSE *a,KEYUSE *b);
static int sort_keyuse(const void *a, const void *b);
static bool are_tables_local(JOIN_TAB *jtab, table_map used_tables);
static bool create_ref_for_key(JOIN *join, JOIN_TAB *j, KEYUSE *org_keyuse,
bool allow_full_scan, table_map used_tables);
@@ -165,9 +165,9 @@ best_extension_by_limited_search(JOIN *join,
table_map *processed_eq_ref_tables);
static uint determine_search_depth(JOIN* join);
C_MODE_START
static int join_tab_cmp(const void *dummy, const void* ptr1, const void* ptr2);
static int join_tab_cmp_straight(const void *dummy, const void* ptr1, const void* ptr2);
static int join_tab_cmp_embedded_first(const void *emb, const void* ptr1, const void *ptr2);
static int join_tab_cmp(void *dummy, const void* ptr1, const void* ptr2);
static int join_tab_cmp_straight(void *dummy, const void* ptr1, const void* ptr2);
static int join_tab_cmp_embedded_first(void *emb, const void* ptr1, const void *ptr2);
C_MODE_END
static uint cache_record_length(JOIN *join,uint index);
static store_key *get_store_key(THD *thd,
@@ -7381,8 +7381,10 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array,
static int
sort_keyuse(KEYUSE *a,KEYUSE *b)
sort_keyuse(const void *a_, const void *b_)
{
const KEYUSE *a= static_cast<const KEYUSE *>(a_);
const KEYUSE *b= static_cast<const KEYUSE *>(b_);
int res;
if (a->table->tablenr != b->table->tablenr)
return (int) (a->table->tablenr - b->table->tablenr);
@@ -10056,7 +10058,7 @@ choose_plan(JOIN *join, table_map join_tables, TABLE_LIST *emb_sjm_nest)
join->thd->variables.optimizer_use_condition_selectivity;
bool straight_join= MY_TEST(join->select_options & SELECT_STRAIGHT_JOIN);
THD *thd= join->thd;
qsort2_cmp jtab_sort_func;
qsort_cmp2 jtab_sort_func;
DBUG_ENTER("choose_plan");
join->limit_optimization_mode= false;
@@ -10203,7 +10205,7 @@ choose_plan(JOIN *join, table_map join_tables, TABLE_LIST *emb_sjm_nest)
1 - jt1 > jt2
*/
static int compare_embedding_subqueries(JOIN_TAB *jt1, JOIN_TAB *jt2)
static int compare_embedding_subqueries(const JOIN_TAB *jt1, const JOIN_TAB *jt2)
{
/* Determine if the first table is originally from a subquery */
TABLE_LIST *tbl1= jt1->table->pos_in_table_list;
@@ -10278,10 +10280,10 @@ static int compare_embedding_subqueries(JOIN_TAB *jt1, JOIN_TAB *jt2)
*/
static int
join_tab_cmp(const void *dummy, const void* ptr1, const void* ptr2)
join_tab_cmp(void *, const void* ptr1, const void* ptr2)
{
JOIN_TAB *jt1= *(JOIN_TAB**) ptr1;
JOIN_TAB *jt2= *(JOIN_TAB**) ptr2;
auto jt1= *(static_cast<const JOIN_TAB *const *>(ptr1));
auto jt2= *(static_cast<const JOIN_TAB *const *>(ptr2));
int cmp;
if ((cmp= compare_embedding_subqueries(jt1, jt2)) != 0)
@@ -10303,10 +10305,10 @@ join_tab_cmp(const void *dummy, const void* ptr1, const void* ptr2)
*/
static int
join_tab_cmp_straight(const void *dummy, const void* ptr1, const void* ptr2)
join_tab_cmp_straight(void *, const void* ptr1, const void* ptr2)
{
JOIN_TAB *jt1= *(JOIN_TAB**) ptr1;
JOIN_TAB *jt2= *(JOIN_TAB**) ptr2;
auto jt1= *(static_cast<const JOIN_TAB *const *>(ptr1));
auto jt2= *(static_cast<const JOIN_TAB *const *>(ptr2));
/*
We don't do subquery flattening if the parent or child select has
@@ -10339,11 +10341,11 @@ join_tab_cmp_straight(const void *dummy, const void* ptr1, const void* ptr2)
*/
static int
join_tab_cmp_embedded_first(const void *emb, const void* ptr1, const void* ptr2)
join_tab_cmp_embedded_first(void *emb, const void* ptr1, const void* ptr2)
{
const TABLE_LIST *emb_nest= (TABLE_LIST*) emb;
JOIN_TAB *jt1= *(JOIN_TAB**) ptr1;
JOIN_TAB *jt2= *(JOIN_TAB**) ptr2;
TABLE_LIST *emb_nest= static_cast<TABLE_LIST *>(emb);
auto jt1= *(static_cast<const JOIN_TAB *const *>(ptr1));
auto jt2= *(static_cast<const JOIN_TAB *const *>(ptr2));
if (jt1->emb_sj_nest == emb_nest && jt2->emb_sj_nest != emb_nest)
return -1;
@@ -11366,9 +11368,11 @@ struct SORT_POSITION
(same table order as used in the original SQL query)
*/
static int
sort_positions(SORT_POSITION *a, SORT_POSITION *b)
static int sort_positions(const void *a_, const void *b_)
{
const SORT_POSITION *a= static_cast<const SORT_POSITION*>(a_);
const SORT_POSITION *b= static_cast<const SORT_POSITION*>(b_);
int cmp;
if ((cmp= compare_embedding_subqueries(*a->join_tab, *b->join_tab)) != 0)
return cmp;
@@ -12018,8 +12022,7 @@ best_extension_by_limited_search(JOIN *join,
Sort tables in ascending order of generated row combinations
*/
if (found_tables > 1)
my_qsort(sort, found_tables, sizeof(SORT_POSITION),
(qsort_cmp) sort_positions);
my_qsort(sort, found_tables, sizeof(SORT_POSITION), sort_positions);
}
DBUG_ASSERT(join->next_sort_position <=
join->sort_positions + join->sort_space);
@@ -23341,7 +23344,7 @@ free_tmp_table(THD *thd, TABLE *entry)
thd->tmp_tables_size+= (entry->file->stats.data_file_length +
entry->file->stats.index_file_length);
}
entry->file->ha_drop_table(entry->s->path.str);
entry->file->drop_table(entry->s->path.str);
delete entry->file;
entry->file= NULL;
entry->reset_created();
@@ -28045,8 +28048,7 @@ static int remove_dup_with_hash_index(THD *thd, TABLE *table,
(*field_length++)= (*ptr)->sort_length();
if (my_hash_init(key_memory_hash_index_key_buffer, &hash, &my_charset_bin,
(uint) file->stats.records, 0, key_length,
(my_hash_get_key) 0, 0, 0))
(uint) file->stats.records, 0, key_length, 0, 0, 0))
{
my_free(key_buffer);
DBUG_RETURN(1);