diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-02-06 20:18:44 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-02-06 20:18:44 +0100 |
| commit | 70a515df434a57709eaf69f451c22739d7908ba4 (patch) | |
| tree | 04630c357d661ceeacf991523c6d329736fa4441 /storage | |
| parent | 4c79e15cc3716f69c044d4287ad2160da8101cdc (diff) | |
| parent | 80ae69c8bc948382920b083ba203369e941cc90e (diff) | |
| download | mariadb-git-70a515df434a57709eaf69f451c22739d7908ba4.tar.gz | |
Merge branch '10.6.12' into 10.6
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/bsonudf.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/bsonudf.cpp b/storage/connect/bsonudf.cpp index 62b5eede5ef..90d057f0936 100644 --- a/storage/connect/bsonudf.cpp +++ b/storage/connect/bsonudf.cpp @@ -3571,7 +3571,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}; @@ -5724,7 +5724,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}; |