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

- Fix a bug in TYPVAL<PSZ> compute causing it sometime not to be executed

Browse Source 
This was the cause of the bug in CalculateArray
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/value.cpp

- Avoid some compiler warnings
  modified:   storage/connect/mongo.cpp
  modified:   storage/connect/tabjmg.cpp
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/tabutil.cpp
This commit is contained in:
Olivier Bertrand
2017-10-16 15:08:17 +02:00
parent 6691d12e2d
commit c83e2a6345
7 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
storage/connect/mongo.cpp
View File

@@ -33,6 +33,7 @@
#define MAXCOL 200 /* Default max column nb in result */
#define TYPE_UNKNOWN 12 /* Must be greater than other types */
bool MakeSelector(PGLOBAL g, PFIL fp, PSTRG s);
bool IsNum(PSZ s);
/***********************************************************************/
@@ -130,7 +131,7 @@ PQRYRES MGOColumns(PGLOBAL g, PCSZ db, PCSZ uri, PTOS topt, bool info)
int i, n = 0;
PCSZ drv;
PBCOL bcp;
MGODISC *cmgd;
MGODISC *cmgd = NULL;
PQRYRES qrp;
PCOLRES crp;
@@ -223,7 +224,7 @@ skipit:
return qrp;
err:
if (cmgd->tmgp)
if (cmgd && cmgd->tmgp)
cmgd->tmgp->CloseDB(g);
return NULL;