diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-29 17:35:27 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-08-29 17:35:27 +0200 |
| commit | 96252b6abd4ab9252fb8ba51f3b11d3e3fa3d603 (patch) | |
| tree | 5aff888e017d44a7d31ea004d2b86561b7a8da6b /storage/connect/mycat.cc | |
| parent | 438211a17524fb67bbf64bc1181ce1f8fb20acf7 (diff) | |
| download | mariadb-git-96252b6abd4ab9252fb8ba51f3b11d3e3fa3d603.tar.gz | |
- New distribution enabling or disabling the MONGO table type
modified: storage/connect/CMakeLists.txt
modified: storage/connect/ha_connect.cc
modified: storage/connect/mycat.cc
- Extend SRCDEF parameter processing to MYSQL
modified: storage/connect/tabext.cpp
modified: storage/connect/tabext.h
modified: storage/connect/tabmysql.cpp
- Typo
modified: storage/connect/mysql-test/connect/std_data/Mongo2.jar
modified: storage/connect/mysql-test/connect/std_data/Mongo3.jar
Diffstat (limited to 'storage/connect/mycat.cc')
| -rw-r--r-- | storage/connect/mycat.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/storage/connect/mycat.cc b/storage/connect/mycat.cc index 23005db5272..0f8d7b76b60 100644 --- a/storage/connect/mycat.cc +++ b/storage/connect/mycat.cc @@ -111,6 +111,9 @@ extern "C" HINSTANCE s_hModule; // Saved module handle #endif // !__WIN__ +#if defined(MONGO_SUPPORT) +bool MongoEnabled(void); +#endif // MONGO_SUPPORT PQRYRES OEMColumns(PGLOBAL g, PTOS topt, char *tab, char *db, bool info); /***********************************************************************/ @@ -558,7 +561,13 @@ PRELDEF MYCAT::MakeTableDesc(PGLOBAL g, PTABLE tablep, LPCSTR am) case TAB_VIR: tdp= new(g) VIRDEF; break; case TAB_JSON: tdp= new(g) JSONDEF; break; #if defined(MONGO_SUPPORT) - case TAB_MONGO: tdp = new(g) MGODEF; break; + 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; |