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

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-15 20:00:58 +01:00
parent 686865e112 2c60d43d7d
commit e95bba9c58
621 changed files with 28475 additions and 5403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_type.h
View File

@ -3702,7 +3702,6 @@ public:
static const Type_handler *blob_type_handler(const Item *item);
static const Type_handler *get_handler_by_field_type(enum_field_types type);
static const Type_handler *get_handler_by_real_type(enum_field_types type);
static const Type_handler *get_handler_by_cmp_type(Item_result type);
static const Type_collection *
type_collection_for_aggregation(const Type_handler *h1,
const Type_handler *h2);