diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:33:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-13 12:33:56 +0300 |
| commit | 99bb3fb656f4a2a06c808b7c5d50e18e4c44b73b (patch) | |
| tree | 121d54271137b00d58b23505644be3bc3a819a9e /storage/connect | |
| parent | cda072bb4ba9e01d523d8deb995f28aa7a19fe11 (diff) | |
| parent | a736a3174a4e7c0d92a38901ae61f563d4afede7 (diff) | |
| download | mariadb-git-99bb3fb656f4a2a06c808b7c5d50e18e4c44b73b.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/bsonudf.cpp | 5 | ||||
| -rw-r--r-- | storage/connect/inihandl.cpp | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/storage/connect/bsonudf.cpp b/storage/connect/bsonudf.cpp index 7022600e140..be58437a766 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" @@ -691,7 +692,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); @@ -4979,7 +4980,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 top, jarp = NULL, jvp = NULL; + PBVAL jarp = NULL, top = NULL, jvp = NULL; PBVAL jsp = bnx.MakeValue(args, 0, true, &top); if (bnx.CheckPath(g, args, jsp, jvp, 2)) diff --git a/storage/connect/inihandl.cpp b/storage/connect/inihandl.cpp index c39c94fb30d..cd06f7fadd7 100644 --- a/storage/connect/inihandl.cpp +++ b/storage/connect/inihandl.cpp @@ -191,7 +191,7 @@ static void PROFILE_Save( FILE *file, PROFILESECTION *section ) secno++; } - for (key = section->key; key; key = key->next) + for (key = section->key; key; key = key->next) { if (key->name[0]) { fprintf(file, "%s", SVP(key->name)); @@ -199,9 +199,9 @@ static void PROFILE_Save( FILE *file, PROFILESECTION *section ) fprintf(file, "=%s", SVP(key->value)); fprintf(file, "\n"); - } // endif key->name - - } // endfor section + } // endif key->name + } + } // endfor section } // end of PROFILE_Save |