diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-08-01 11:39:10 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-08-01 11:39:10 +0300 |
| commit | 60c9485a8e5ebf410d9fa60caa7937f3fe3ca9b8 (patch) | |
| tree | c40fb24f5afc0481c8637dbd0a9a673567118651 /storage/connect/connect.cc | |
| parent | 31f4df450502d96854c052ce3cd2858ce9dbf900 (diff) | |
| download | mariadb-git-60c9485a8e5ebf410d9fa60caa7937f3fe3ca9b8.tar.gz | |
Merge connect/10.0 into 10.0
Squash all connect/10.0's commits into one and keep only
changes from storage/connect directory.
Diffstat (limited to 'storage/connect/connect.cc')
| -rw-r--r-- | storage/connect/connect.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc index e15cc724b85..c5a29fe7416 100644 --- a/storage/connect/connect.cc +++ b/storage/connect/connect.cc @@ -1,4 +1,5 @@ /* Copyright (C) Olivier Bertrand 2004 - 2017 + Copyright (C) MariaDB Corporation Ab This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -66,8 +67,10 @@ PGLOBAL CntExit(PGLOBAL g) if (g) { CntEndDB(g); - if (g->Activityp) - delete g->Activityp; + if (g->Activityp) { + delete g->Activityp; + g->Activityp = NULL; + } // endif Activityp PlugExit(g); g= NULL; @@ -185,10 +188,10 @@ bool CntInfo(PGLOBAL g, PTDB tp, PXF info) /***********************************************************************/ PTDB CntGetTDB(PGLOBAL g, LPCSTR name, MODE mode, PHC h) { - PTDB tdbp; + PTDB tdbp = NULL; PTABLE tabp; PDBUSER dup = PlgGetUser(g); - volatile PCATLG cat = (dup) ? dup->Catalog : NULL; // Safe over longjmp + volatile PCATLG cat = (dup) ? dup->Catalog : NULL; // Safe over throw if (trace) printf("CntGetTDB: name=%s mode=%d cat=%p\n", name, mode, cat); |