diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-06 19:56:57 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-06 19:56:57 +0200 |
| commit | 0387c13ee777b67d533f350e2f2e43c30e3b3307 (patch) | |
| tree | cd78be72a8a3cac89a8c6aab5c6df487d08992e4 /storage/connect/tabjson.cpp | |
| parent | d8f99f165bf4f88cb9b0ccb0c58d8a129bf4f18c (diff) | |
| download | mariadb-git-0387c13ee777b67d533f350e2f2e43c30e3b3307.tar.gz | |
- Add a define making ha_connect.cc source unique for all MariaDB version.
#if defined(NEW_MAR)
#define stored_in_db stored_in_db()
#endif // NEW_MAR)
modified: storage/connect/CMakeLists.txt
modified: storage/connect/ha_connect.cc
- Fix compile failure for some configuration of CONNECT.
This by updating the #ifdef's JDBC, MONGO and CMGO_SUPPORT.
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
- Fix failure of zip.test (restore code wrongly deleted)
modified: storage/connect/tabjson.cpp
- Make sure thread TBL table structure is correctly initialized.
modified: storage/connect/tabtbl.cpp
- Add new test case in tbl_thread.test
modified: storage/connect/mysql-test/connect/r/tbl_thread.result
modified: storage/connect/mysql-test/connect/t/tbl_thread.test
- Remake a jar file after Java was updated
modified: storage/connect/mysql-test/connect/std_data/Mongo3.jar
Diffstat (limited to 'storage/connect/tabjson.cpp')
| -rw-r--r-- | storage/connect/tabjson.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/storage/connect/tabjson.cpp b/storage/connect/tabjson.cpp index 655cef18de3..5c79e62b514 100644 --- a/storage/connect/tabjson.cpp +++ b/storage/connect/tabjson.cpp @@ -31,11 +31,13 @@ #if defined(ZIP_SUPPORT) #include "filamzip.h" #endif // ZIP_SUPPORT +#if defined(MONGO_SUPPORT) #if defined(JDBC_SUPPORT) #include "jmgfam.h" #endif // JDBC_SUPPORT #if defined(CMGO_SUPPORT) #include "cmgfam.h" +#endif // CMGO_SUPPORT #endif // MONGO_SUPPORT #include "tabmul.h" #include "checklvl.h" @@ -129,8 +131,8 @@ PQRYRES JSONColumns(PGLOBAL g, PCSZ db, PCSZ dsn, PTOS topt, bool info) #endif // ZIP_SUPPORT tdp->Fn = GetStringTableOption(g, topt, "Filename", NULL); -//if (!(tdp->Database = SetPath(g, db))) -// return NULL; + if (!(tdp->Database = SetPath(g, db))) + return NULL; tdp->Objname = GetStringTableOption(g, topt, "Object", NULL); tdp->Base = GetIntegerTableOption(g, topt, "Base", 0) ? 1 : 0; @@ -502,10 +504,10 @@ JSONDEF::JSONDEF(void) Pipe = false; Driver = NULL; Version = 0; -#endif // MONGO_SUPPORT #if defined(JDBC_SUPPORT) Wrapname = NULL; #endif // JDBC_SUPPORT +#endif // MONGO_SUPPORT } // end of JSONDEF constructor /***********************************************************************/ |