database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +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

12
sql/sql_select.h
View File

@@ -2018,7 +2018,7 @@ int opt_sum_query(THD* thd,
List<TABLE_LIST> &tables, List<Item> &all_fields, COND *conds);
/* from sql_delete.cc, used by opt_range.cc */
extern "C" int refpos_order_cmp(void* arg, const void *a,const void *b);
extern "C" int refpos_order_cmp(void *arg, const void *a,const void *b);
/** class to copying an field/item to a key struct */
@@ -2709,15 +2709,7 @@ void propagate_new_equalities(THD *thd, Item *cond,
COND_EQUAL *inherited,
bool *is_simplifiable_cond);
template<typename T> T prev_bits(T n_bits)
{
if (!n_bits)
return 0;
T tmp= ((T)1 << (n_bits - 1));
return (tmp - 1) | tmp;
}
// A wrapper for the above function:
#define PREV_BITS(type, A) prev_bits<type>(A)
#define PREV_BITS(type, N_BITS) ((type)my_set_bits(N_BITS))
bool dbug_user_var_equals_str(THD *thd, const char *name, const char *value);