diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-04-26 19:52:34 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-26 20:50:31 +0200 |
| commit | 5fe0087a7234bb0b1304c8aeb010e00eca5cce5c (patch) | |
| tree | b1c90bb312bd62367dba48e278e0dadeeb3d2489 | |
| parent | f22ed2779fb218b8c09ab0f20e43e102c8e8ea5d (diff) | |
| download | mariadb-git-5fe0087a7234bb0b1304c8aeb010e00eca5cce5c.tar.gz | |
CONNECT compilation failure
| -rw-r--r-- | storage/connect/filter.h | 1 | ||||
| -rw-r--r-- | storage/connect/jmgoconn.cpp | 4 | ||||
| -rw-r--r-- | storage/connect/mycat.cc | 9 |
3 files changed, 3 insertions, 11 deletions
diff --git a/storage/connect/filter.h b/storage/connect/filter.h index c6ab8fddd35..b0fea3d69e0 100644 --- a/storage/connect/filter.h +++ b/storage/connect/filter.h @@ -48,6 +48,7 @@ class DllExport FILTER : public XOBJECT { /* Filter description block */ PVAL &Val(int i) {return Test[i].Value;} bool &Conv(int i) {return Test[i].Conv;} void SetNext(PFIL filp) {Next = filp;} + bool MakeSelector(PGLOBAL g, PSTRG s); // Methods virtual void Reset(void); diff --git a/storage/connect/jmgoconn.cpp b/storage/connect/jmgoconn.cpp index bd1ddadd80d..c786e78a081 100644 --- a/storage/connect/jmgoconn.cpp +++ b/storage/connect/jmgoconn.cpp @@ -272,7 +272,7 @@ bool JMgoConn::MakeCursor(PGLOBAL g, PTDB tdbp, PCSZ options, if (MakeSelector(g, filp, s)) { strcpy(g->Message, "Failed making selector"); - return NULL; + return true; } else s->Append('}'); @@ -340,7 +340,7 @@ bool JMgoConn::MakeCursor(PGLOBAL g, PTDB tdbp, PCSZ options, if (MakeSelector(g, filp, s)) { strcpy(g->Message, "Failed making selector"); - return NULL; + return true; } // endif Selector tdbp->SetFilter(NULL); // Not needed anymore diff --git a/storage/connect/mycat.cc b/storage/connect/mycat.cc index 9fb8fc8367d..131245929e0 100644 --- a/storage/connect/mycat.cc +++ b/storage/connect/mycat.cc @@ -545,15 +545,6 @@ PRELDEF MYCAT::MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am) case TAB_PIVOT: tdp= new(g) PIVOTDEF; break; case TAB_VIR: tdp= new(g) VIRDEF; break; case TAB_JSON: tdp= new(g) JSONDEF; break; -#if defined(MONGO_SUPPORT) - case TAB_MONGO: -// if (MongoEnabled()) - tdp = new(g) MGODEF; -// else -// strcpy(g->Message, "MONGO type not enabled"); - - break; -#endif // MONGO_SUPPORT #if defined(ZIP_SUPPORT) case TAB_ZIP: tdp = new(g) ZIPDEF; break; #endif // ZIP_SUPPORT |