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

Merge 11.4 into 11.6

Browse source
This commit is contained in:
Marko Mäkelä 2024-09-04 10:38:25 +03:00
commit a5b80531fb
78 changed files with 1734 additions and 1271 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/item.h
View file

@ -4769,6 +4769,8 @@ public:
{
return const_charset_converter(thd, tocs, true, func_name);
}
Item *do_get_copy(THD *thd) const override
{ return get_item_copy<Item_static_float_func>(thd, this); }
};
@ -4932,7 +4934,6 @@ public:
}
Item *do_get_copy(THD *thd) const override
{ return get_item_copy<Item_string_with_introducer>(thd, this); }
Item *do_build_clone(THD *thd) const override { return get_copy(thd); }
};
@ -4947,7 +4948,6 @@ public:
{ }
Item *do_get_copy(THD *thd) const override
{ return get_item_copy<Item_string_sys>(thd, this); }
Item *do_build_clone(THD *thd) const override { return get_copy(thd); }
};
@ -4964,7 +4964,6 @@ public:
{ }
Item *do_get_copy(THD *thd) const override
{ return get_item_copy<Item_string_ascii>(thd, this); }
Item *do_build_clone(THD *thd) const override { return get_copy(thd); }
};
@ -5003,7 +5002,6 @@ public:
}
Item *do_get_copy(THD *thd) const override
{ return get_item_copy<Item_static_string_func>(thd, this); }
Item *do_build_clone(THD *thd) const override { return get_copy(thd); }
};
@ -5023,7 +5021,6 @@ public:
}
Item *do_get_copy(THD *thd) const override
{ return get_item_copy<Item_partition_func_safe_string>(thd, this); }
Item *do_build_clone(THD *thd) const override { return get_copy(thd); }
};
@ -5187,7 +5184,6 @@ public:
void print(String *str, enum_query_type query_type) override;
Item *do_get_copy(THD *thd) const override
{ return get_item_copy<Item_bin_string>(thd, this); }
Item *do_build_clone(THD *thd) const override { return get_copy(thd); }
};