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 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-11-29 12:37:46 +02:00
parent 19acb0257e fdb6db6b47
commit 7d4077cc11
246 changed files with 2643 additions and 1635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_type.cc
View File

@ -5876,9 +5876,9 @@ cmp_item *Type_handler_timestamp_common::make_cmp_item(THD *thd,
/***************************************************************************/
static int srtcmp_in(const void *cs_, const void *x_, const void *y_)
static int srtcmp_in(void *cs_, const void *x_, const void *y_)
{
const CHARSET_INFO *cs= static_cast<const CHARSET_INFO *>(cs_);
CHARSET_INFO *cs= static_cast<CHARSET_INFO *>(cs_);
const String *x= static_cast<const String *>(x_);
const String *y= static_cast<const String *>(y_);
return cs->strnncollsp(x->ptr(), x->length(), y->ptr(), y->length());
@ -5888,12 +5888,10 @@ in_vector *Type_handler_string_result::make_in_vector(THD *thd,
const Item_func_in *func,
uint nargs) const
{
return new (thd->mem_root) in_string(thd, nargs, (qsort2_cmp) srtcmp_in,
func->compare_collation());
return new (thd->mem_root)
in_string(thd, nargs, srtcmp_in, func->compare_collation());
}
in_vector *Type_handler_int_result::make_in_vector(THD *thd,
const Item_func_in *func,
uint nargs) const
@ -6184,7 +6182,7 @@ longlong Type_handler_timestamp_common::
longlong Type_handler_numeric::
Item_func_min_max_val_int(Item_func_min_max *func) const
{
return func->val_int_native();
return is_unsigned() ? func->val_uint_native() : func->val_int_native();
}
@ -9598,9 +9596,11 @@ Charset::eq_collation_specific_names(CHARSET_INFO *cs) const
return name0.length && !cmp(&name0, &name1);
}
int initialize_data_type_plugin(st_plugin_int *plugin)
int initialize_data_type_plugin(void *plugin_)
{
st_mariadb_data_type *data= (st_mariadb_data_type*) plugin->plugin->info;
st_plugin_int *plugin= static_cast<st_plugin_int *>(plugin_);
st_mariadb_data_type *data=
static_cast<st_mariadb_data_type *>(plugin->plugin->info);
data->type_handler->set_name(Name(plugin->name));
if (plugin->plugin->init && plugin->plugin->init(NULL))
{