diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-07-02 23:33:22 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-07-03 22:28:55 +0200 |
| commit | b63f847743c304437608454c904dc7822523d2fa (patch) | |
| tree | 66e23c093bafce396ff0b730254a7e164173469b /storage/connect/jdbconn.cpp | |
| parent | 94e5d7de85a2964e7dd9a02e91a71522ccc66f94 (diff) | |
| download | mariadb-git-b63f847743c304437608454c904dc7822523d2fa.tar.gz | |
- Suppress warning when creating mongo JSON tables
modified: storage/connect/ha_connect.cc
- Add catalog table for Mongo java driver tables
modified: storage/connect/mongo.cpp
modified: storage/connect/mongo.h
modified: storage/connect/tabjmg.cpp
modified: storage/connect/tabjmg.h
Diffstat (limited to 'storage/connect/jdbconn.cpp')
| -rw-r--r-- | storage/connect/jdbconn.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/jdbconn.cpp b/storage/connect/jdbconn.cpp index 8cc35b9007d..dbfd1b0e24d 100644 --- a/storage/connect/jdbconn.cpp +++ b/storage/connect/jdbconn.cpp @@ -56,7 +56,7 @@ //#if defined(__WIN__) //extern "C" HINSTANCE s_hModule; // Saved module handle //#endif // __WIN__ -//#define nullptr 0 +#define nullptr 0 TYPCONV GetTypeConv(); int GetConvSize(); |