summaryrefslogtreecommitdiff
path: root/storage/connect/connect.cc
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2017-07-18 13:16:55 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2017-07-18 13:16:55 +0200
commitf590296c28ec54007692181e010d7064c1071ff2 (patch)
tree8ca5932a93f59bb60abfb0928ef483e96ed999d6 /storage/connect/connect.cc
parenta9d32010d0ba36cc9b9d7fb58eeace687bb13f7a (diff)
downloadmariadb-git-f590296c28ec54007692181e010d7064c1071ff2.tar.gz
-- Finalize work on MongoDB access
Implement discovery for the MongoDB Java Driver Create classes to minimize code and avoid dupicates Rearrange and rename implied files modified: storage/connect/CMakeLists.txt renamed: storage/connect/mongofam.cpp -> storage/connect/cmgfam.cpp renamed: storage/connect/mongofam.h -> storage/connect/cmgfam.h modified: storage/connect/cmgoconn.h modified: storage/connect/javaconn.h modified: storage/connect/jdbconn.cpp modified: storage/connect/jmgoconn.cpp modified: storage/connect/jmgoconn.h modified: storage/connect/mongo.cpp modified: storage/connect/mongo.h renamed: storage/connect/tabmgo.cpp -> storage/connect/tabcmg.cpp renamed: storage/connect/tabmgo.h -> storage/connect/tabcmg.h modified: storage/connect/tabjmg.cpp modified: storage/connect/tabjmg.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h -- Trace Sarea allocation and freeing modified: storage/connect/connect.cc modified: storage/connect/plugutil.cpp modified: storage/connect/user_connect.cc -- Null Json values where not mark as null in JSNX::SetJsonValue This was added in TYPE_NULL (declared as TYPE_VOID) modified: storage/connect/json.cpp modified: storage/connect/json.h modified: storage/connect/jsonudf.cpp -- Null JValues are ignored in JSNX::CalculateArray Also done in tabjson.cpp for JSONCOL::CalculateArray modified: storage/connect/json.h modified: storage/connect/jsonudf.cpp modified: storage/connect/tabjson.cpp -- Null JSON values now represented by connect_json_null session variable modified: storage/connect/json.cpp modified: storage/connect/json.h modified: storage/connect/jsonudf.cpp modified: storage/connect/tabjson.cpp -- JVALUE has size = 1 modified: storage/connect/json.h -- Fix by vuvova because Debian compilation failure. modified: storage/connect/value.cpp
Diffstat (limited to 'storage/connect/connect.cc')
-rw-r--r--storage/connect/connect.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc
index 08d35b05932..8f06a710ef2 100644
--- a/storage/connect/connect.cc
+++ b/storage/connect/connect.cc
@@ -80,7 +80,7 @@ PGLOBAL CntExit(PGLOBAL g)
/* CntEndDB: DB termination semantic routine. */
/***********************************************************************/
void CntEndDB(PGLOBAL g)
- {
+{
PDBUSER dbuserp= PlgGetUser(g);
if (dbuserp) {
@@ -88,9 +88,14 @@ void CntEndDB(PGLOBAL g)
delete dbuserp->Catalog;
free(dbuserp);
- } // endif dbuserp
- } // end of CntEndDB
+ if (trace)
+ htrc("CntEndDB: Freeing Dup\n");
+
+ g->Activityp->Aptr = NULL;
+ } // endif dbuserp
+
+} // end of CntEndDB
/***********************************************************************/
/* CntCheckDB: Initialize a DB application session. */