diff options
| author | Sergei Krivonos <sergeikrivonos@gmail.com> | 2021-10-06 11:31:08 +0300 |
|---|---|---|
| committer | Sergei Krivonos <sergeikrivonos@gmail.com> | 2021-10-08 17:05:52 +0300 |
| commit | 164e84c9efb5a7f9fa90989e482ed9e1f49a39dc (patch) | |
| tree | f68f6924279b1e35c0b5962103756d61c59d969d /storage/connect/bsonudf.cpp | |
| parent | c4a58ca06a82e7fe94603f1d6cbcf1099b48c28d (diff) | |
| download | mariadb-git-10.2-MDEV-19129.tar.gz | |
Xcode compatibility update10.2-MDEV-19129
Diffstat (limited to 'storage/connect/bsonudf.cpp')
| -rw-r--r-- | storage/connect/bsonudf.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/connect/bsonudf.cpp b/storage/connect/bsonudf.cpp index 783be52602a..55ccd597b8d 100644 --- a/storage/connect/bsonudf.cpp +++ b/storage/connect/bsonudf.cpp @@ -12,6 +12,7 @@ #include <mysql.h> #include <sql_error.h> #include <stdio.h> +#include <cassert> #include "bsonudf.h" @@ -621,7 +622,7 @@ PVAL BJNX::GetCalcValue(PGLOBAL g, PBVAL bap, int n) { // For calculated arrays, a local Value must be used int lng = 0; - short type, prec = 0; + short type = 0, prec = 0; bool b = n < Nod - 1; PVAL valp; PBVAL vlp, vp; @@ -690,7 +691,7 @@ PVAL BJNX::GetCalcValue(PGLOBAL g, PBVAL bap, int n) break; default: - break; + DBUG_ASSERT(!"Implement new op type support."); } // endswitch Op return valp = AllocateValue(g, type, lng, prec); @@ -4978,7 +4979,7 @@ char *bbin_array_add(UDF_INIT *initid, UDF_ARGS *args, char *result, uint n = 2; int* x = GetIntArgPtr(g, args, n); BJNX bnx(g, NULL, TYPE_STRING); - PBVAL jarp, top, jvp = NULL; + PBVAL jarp = nullptr, top = nullptr, jvp = nullptr; PBVAL jsp = bnx.MakeValue(args, 0, true, &top); if (bnx.CheckPath(g, args, jsp, jvp, 2)) @@ -5611,7 +5612,7 @@ char *bbin_object_values(UDF_INIT *initid, UDF_ARGS *args, char *result, if (!bsp) { if (!CheckMemory(g, initid, args, 1, true, true)) { BJNX bnx(g); - PBVAL top, jarp; + PBVAL top, jarp = nullptr; PBVAL jvp = bnx.MakeValue(args, 0, true, &top); if (jvp->Type == TYPE_JOB) { |