diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-05-12 00:33:33 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-05-12 00:33:33 +0200 |
| commit | 436070c6e106d22f2afce3a28fc15e33a2241ef9 (patch) | |
| tree | a5404c0419e49a410733dc96406e81445c7ce448 /storage/connect/tabjson.h | |
| parent | 1c88b9a8d3200bdf554ece09316cacf2146877ee (diff) | |
| download | mariadb-git-436070c6e106d22f2afce3a28fc15e33a2241ef9.tar.gz | |
Fix failing test connect.json for MariaDB 10.0
Suppressing Uri and dsn from json tables (was MGO)
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
Diffstat (limited to 'storage/connect/tabjson.h')
| -rw-r--r-- | storage/connect/tabjson.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/connect/tabjson.h b/storage/connect/tabjson.h index 2c8f226b5ca..c16cf6846b6 100644 --- a/storage/connect/tabjson.h +++ b/storage/connect/tabjson.h @@ -36,7 +36,7 @@ class DllExport JSONDEF : public DOSDEF { /* Table description */ friend class TDBJSON; friend class TDBJSN; friend class TDBJCL; - friend PQRYRES JSONColumns(PGLOBAL, char*, char*, PTOS, bool); + friend PQRYRES JSONColumns(PGLOBAL, char*, PTOS, bool); public: // Constructor JSONDEF(void); @@ -58,7 +58,6 @@ public: int Level; /* Used for catalog table */ int Base; /* The array index base */ bool Strict; /* Strict syntax checking */ - const char *Uri; /* MongoDB connection URI */ }; // end of JSONDEF /* -------------------------- TDBJSN class --------------------------- */ |