1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-29578 Fix CONNECT build warnings

Browse Source 
Fix a couple of build warnings that fire with CONNECT engine.
This commit is contained in:
Andrew Hutchings 2022-09-22 15:13:22 +01:00 committed by Daniel Black
parent 055cb3fcd1
commit fa5f26b422
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/connect/bsonudf.cpp
View File

@ -3571,14 +3571,14 @@ char *bson_item_merge(UDF_INIT *initid, UDF_ARGS *args, char *result,
if (!CheckMemory(g, initid, args, 2, false, false, true)) { if (!CheckMemory(g, initid, args, 2, false, false, true)) {
JTYP type; JTYP type;
BJNX bnx(g); BJNX bnx(g);
PBVAL jvp, top = NULL; PBVAL jvp = NULL, top = NULL;
PBVAL jsp[2] = {NULL, NULL}; PBVAL jsp[2] = {NULL, NULL};
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
jvp = bnx.MakeValue(args, i, true); jvp = bnx.MakeValue(args, i, true);
if (i) { if (i) {
if (jvp->Type != type) { if (jvp && (jvp->Type != type)) {
PUSH_WARNING("Argument types mismatch"); PUSH_WARNING("Argument types mismatch");
goto fin; goto fin;
} // endif type } // endif type
@ -5722,14 +5722,14 @@ char *bbin_item_merge(UDF_INIT *initid, UDF_ARGS *args, char *result,
if (!CheckMemory(g, initid, args, 2, false, false, true)) { if (!CheckMemory(g, initid, args, 2, false, false, true)) {
JTYP type; JTYP type;
BJNX bnx(g); BJNX bnx(g);
PBVAL jvp, top = NULL; PBVAL jvp = NULL, top = NULL;
PBVAL jsp[2] = {NULL, NULL}; PBVAL jsp[2] = {NULL, NULL};
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (i) { if (i) {
jvp = bnx.MakeValue(args, i, true); jvp = bnx.MakeValue(args, i, true);
if (jvp->Type != type) { if (jvp && (jvp->Type != type)) {
PUSH_WARNING("Argument types mismatch"); PUSH_WARNING("Argument types mismatch");
goto fin; goto fin;
} // endif type } // endif type

2
storage/connect/filamdbf.cpp
View File

@ -244,7 +244,7 @@ PQRYRES DBFColumns(PGLOBAL g, PCSZ dp, PCSZ fn, PTOS topt, bool info)
int rc, type, len, field, fields; int rc, type, len, field, fields;
bool bad, mul; bool bad, mul;
PCSZ target, pwd; PCSZ target, pwd;
DBFHEADER mainhead, *hp; DBFHEADER mainhead, *hp = NULL;
DESCRIPTOR thisfield, *tfp; DESCRIPTOR thisfield, *tfp;
FILE *infile = NULL; FILE *infile = NULL;
UNZIPUTL *zutp = NULL; UNZIPUTL *zutp = NULL;