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.4 to 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-10-22 17:08:49 +03:00
parent cca75c95bc 9868253b32
commit 1657b7a583
185 changed files with 3709 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_type.cc
View File

@ -5703,10 +5703,12 @@ cmp_item *Type_handler_timestamp_common::make_cmp_item(THD *thd,
/***************************************************************************/
static int srtcmp_in(CHARSET_INFO *cs, const String *x,const String *y)
static int srtcmp_in(const void *cs_, const void *x_, const void *y_)
{
return cs->strnncollsp(x->ptr(), x->length(),
y->ptr(), y->length());
const CHARSET_INFO *cs= static_cast<const 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());
}
in_vector *Type_handler_string_result::make_in_vector(THD *thd,