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.6' into 10.11

Browse Source
This commit is contained in:
Sergei Golubchik
2023-12-17 16:56:38 +01:00
parent 9a7deb1c36 aff5ed3988
commit fd0b47f9d6
629 changed files with 27336 additions and 4573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_type.h
View File

@ -151,8 +151,8 @@ scalar_comparison_op_to_lex_cstring(scalar_comparison_op op)
case SCALAR_CMP_EQUAL: return LEX_CSTRING{STRING_WITH_LEN("<=>")};
case SCALAR_CMP_LT: return LEX_CSTRING{STRING_WITH_LEN("<")};
case SCALAR_CMP_LE: return LEX_CSTRING{STRING_WITH_LEN("<=")};
case SCALAR_CMP_GE: return LEX_CSTRING{STRING_WITH_LEN(">")};
case SCALAR_CMP_GT: return LEX_CSTRING{STRING_WITH_LEN(">=")};
case SCALAR_CMP_GE: return LEX_CSTRING{STRING_WITH_LEN(">=")};
case SCALAR_CMP_GT: return LEX_CSTRING{STRING_WITH_LEN(">")};
}
DBUG_ASSERT(0);
return LEX_CSTRING{STRING_WITH_LEN("<?>")};
@ -3690,7 +3690,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);