mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.6 into 10.11

Browse source
This commit is contained in:
Marko Mäkelä 2025-05-26 08:10:47 +03:00
commit 3da36fa130
44 changed files with 2179 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/mroonga/udf/mrn_udf_command.cpp
View file

@ -220,7 +220,7 @@ static void mroonga_command_escape_value(grn_ctx *ctx,
}
MRN_API char *mroonga_command(UDF_INIT *init, UDF_ARGS *args, char *result,
unsigned long *length, char *is_null, char *error)
unsigned long *length, uchar *is_null, uchar *error)
{
CommandInfo *info = (CommandInfo *)init->ptr;
grn_ctx *ctx = info->ctx;

2
storage/mroonga/udf/mrn_udf_escape.cpp
View file

@ -214,7 +214,7 @@ static void escape(EscapeInfo *info, UDF_ARGS *args)
}
MRN_API char *mroonga_escape(UDF_INIT *init, UDF_ARGS *args, char *result,
unsigned long *length, char *is_null, char *error)
unsigned long *length, uchar *is_null, uchar *error)
{
EscapeInfo *info = reinterpret_cast<EscapeInfo *>(init->ptr);
grn_ctx *ctx = info->ctx;

4
storage/mroonga/udf/mrn_udf_highlight_html.cpp
View file

@ -412,8 +412,8 @@ MRN_API char *mroonga_highlight_html(UDF_INIT *init,
UDF_ARGS *args,
char *result,
unsigned long *length,
char *is_null,
char *error)
uchar *is_null,
uchar *error)
{
MRN_DBUG_ENTER_FUNCTION();

2
storage/mroonga/udf/mrn_udf_last_insert_grn_id.cpp
View file

@ -45,7 +45,7 @@ MRN_API my_bool last_insert_grn_id_init(UDF_INIT *init, UDF_ARGS *args, char *me
return 0;
}
MRN_API longlong last_insert_grn_id(UDF_INIT *init, UDF_ARGS *args, char *is_null, char *error)
MRN_API longlong last_insert_grn_id(UDF_INIT *init, UDF_ARGS *args, uchar *is_null, uchar *error)
{
THD *thd = current_thd;
st_mrn_slot_data *slot_data = mrn_get_slot_data(thd, false);

2
storage/mroonga/udf/mrn_udf_normalize.cpp
View file

@ -151,7 +151,7 @@ error:
}
MRN_API char *mroonga_normalize(UDF_INIT *init, UDF_ARGS *args, char *result,
unsigned long *length, char *is_null, char *error)
unsigned long *length, uchar *is_null, uchar *error)
{
st_mrn_normalize_info *info = (st_mrn_normalize_info *)init->ptr;
grn_ctx *ctx = info->ctx;

4
storage/mroonga/udf/mrn_udf_query_expand.cpp
View file

@ -244,8 +244,8 @@ MRN_API char *mroonga_query_expand(UDF_INIT *init,
UDF_ARGS *args,
char *result,
unsigned long *length,
char *is_null,
char *error)
uchar *is_null,
uchar *error)
{
MRN_DBUG_ENTER_FUNCTION();

2
storage/mroonga/udf/mrn_udf_snippet.cpp
View file

@ -248,7 +248,7 @@ error:
}
MRN_API char *mroonga_snippet(UDF_INIT *init, UDF_ARGS *args, char *result,
unsigned long *length, char *is_null, char *error)
unsigned long *length, uchar *is_null, uchar *error)
{
st_mrn_snip_info *snip_info = (st_mrn_snip_info *) init->ptr;
grn_ctx *ctx = snip_info->ctx;

4
storage/mroonga/udf/mrn_udf_snippet_html.cpp
View file

@ -323,8 +323,8 @@ MRN_API char *mroonga_snippet_html(UDF_INIT *init,
UDF_ARGS *args,
char *result,
unsigned long *length,
char *is_null,
char *error)
uchar *is_null,
uchar *error)
{
MRN_DBUG_ENTER_FUNCTION();