database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.6 into 10.8

Browse Source
This commit is contained in:
Marko Mäkelä
2023-02-10 13:43:53 +02:00
parent 29cd17e8d9 6aec87544c
commit dbab3e8d90
299 changed files with 2528 additions and 1655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/connect/bsonudf.cpp
View File

@@ -3572,7 +3572,7 @@ char *bson_item_merge(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif Xchk
if (!CheckMemory(g, initid, args, 2, false, false, true)) {
JTYP type;
JTYP type= TYPE_JAR;
BJNX bnx(g);
PBVAL jvp = NULL, top = NULL;
PBVAL jsp[2] = {NULL, NULL};
@@ -5725,7 +5725,7 @@ char *bbin_item_merge(UDF_INIT *initid, UDF_ARGS *args, char *result,
} // endif Xchk
if (!CheckMemory(g, initid, args, 2, false, false, true)) {
JTYP type;
JTYP type = TYPE_JAR;
BJNX bnx(g);
PBVAL jvp = NULL, top = NULL;
PBVAL jsp[2] = {NULL, NULL};