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

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-01-30 09:46:52 +01:00
parent 12cad0c346 41a163ac5c
commit a576a1cea5
440 changed files with 7883 additions and 3481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/field.h
View File

@ -4284,6 +4284,8 @@ uint gis_field_options_read(const uchar *buf, size_t buf_len,
class Field_enum :public Field_str {
static void do_field_enum(Copy_field *copy_field);
bool can_optimize_range_or_keypart_ref(const Item_bool_func *cond,
const Item *item) const;
protected:
uint packlength;
public:
@ -4370,7 +4372,10 @@ public:
const uchar *from_end, uint param_data);
bool can_optimize_keypart_ref(const Item_bool_func *cond,
const Item *item) const;
const Item *item) const
{
return can_optimize_range_or_keypart_ref(cond, item);
}
bool can_optimize_group_min_max(const Item_bool_func *cond,
const Item *const_item) const
{
@ -4385,7 +4390,10 @@ public:
}
bool can_optimize_range(const Item_bool_func *cond,
const Item *item,
bool is_eq_func) const;
bool is_eq_func) const
{
return can_optimize_range_or_keypart_ref(cond, item);
}
private:
int save_field_metadata(uchar *first_byte);
bool is_equal(const Column_definition &new_field) const;