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 branch '10.11' into 11.2

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-10-29 16:39:47 +01:00
parent 52723ec09a 3d0fb15028
commit 69d033d165
660 changed files with 8148 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/opt_subselect.cc
View File

@@ -2861,7 +2861,8 @@ bool find_eq_ref_candidate(TABLE *table, table_map sj_inner_tables)
keyuse++;
} while (keyuse->key == key && keyuse->table == table);
if (bound_parts == PREV_BITS(uint, keyinfo->user_defined_key_parts))
if (bound_parts == PREV_BITS(key_part_map,
keyinfo->user_defined_key_parts))
return TRUE;
}
else
@@ -6174,7 +6175,7 @@ Item *and_new_conditions_to_optimized_cond(THD *thd, Item *cond,
List_iterator_fast<Item_equal> ei(*cond_equalities);
while ((mult_eq= ei++))
{
if (mult_eq->const_item() && !mult_eq->val_int())
if (mult_eq->const_item() && !mult_eq->val_bool())
is_simplified_cond= true;
else
{
@@ -6264,7 +6265,7 @@ Item *and_new_conditions_to_optimized_cond(THD *thd, Item *cond,
List_iterator_fast<Item_equal> ei(new_cond_equal.current_level);
while ((mult_eq=ei++))
{
if (mult_eq->const_item() && !mult_eq->val_int())
if (mult_eq->const_item() && !mult_eq->val_bool())
is_simplified_cond= true;
else
{