Squashed commit of connect/10.0:

commit c545d544378483bf68c4fb713cd4ec872d0df2c4
Author: Olivier Bertrand <bertrandop@gmail.com>
Date:   Tue Mar 27 23:13:14 2018 +0200

    - Fix MDEV-15577 CONNECT engine JDBC remote index prevents UPDATE
      Fixed in TDBJDBC::OpenDB because query can be null for updates
      modified:   storage/connect/tabjdbc.cpp

commit c4f1fe2e8e74566e9c3296f435448d9f5c718b23
Author: Olivier Bertrand <bertrandop@gmail.com>
Date:   Wed Mar 14 12:21:17 2018 +0100

    - Fix MDEV-15429 CONNECT engine JDBC handling Postgresql UUID type
      Also handle Postgresql sending type VARCHAR for TEXT column and
      setting length to b x7FFFFFF when the length is unknown.
      modified:   storage/connect/Client.java
      modified:   storage/connect/JavaWrappers.jar
      modified:   storage/connect/JdbcInterface.java
      modified:   storage/connect/PostgresqlInterface.java
      modified:   storage/connect/global.h
      modified:   storage/connect/ha_connect.cc
      modified:   storage/connect/jdbconn.cpp
      modified:   storage/connect/jdbconn.h
      modified:   storage/connect/mysql-test/connect/r/jdbc_postgresql.result
      modified:   storage/connect/mysql-test/connect/t/jdbc_postgresql.test
      modified:   storage/connect/mysql-test/connect/t/jdbconn.inc
      modified:   storage/connect/plgdbsem.h
      modified:   storage/connect/tabjdbc.cpp
      modified:   storage/connect/tabjdbc.h
      added:      storage/connect/mysql-test/connect/std_data/JavaWrappers.jar

commit 3068bb4882a316c6c32c624609db2bf24ae3ad40
Author: Olivier Bertrand <bertrandop@gmail.com>
Date:   Mon Feb 26 19:40:27 2018 +0100

    Revert to old cmake file to avoid compile error

commit da8c1c0bd6a327fd03bd321be3170f468122ef67
Author: Olivier Bertrand <bertrandop@gmail.com>
Date:   Mon Feb 26 16:13:39 2018 +0100

    - Remove warning on not used tabtyp variable in connect_assisted_discovery
      modified:   storage/connect/ha_connect.cc

    - Fix a bug causing CONNECT to loop when expanding a JSON column
      when the expanded column value is null or void array.
    - Adding the FullArray option to JSON tables.
    - Skipping expanded JSON lines when the expanded column value is null.
      modified:   storage/connect/connect.cc
      modified:   storage/connect/tabdos.h
      modified:   storage/connect/tabjson.cpp
      modified:   storage/connect/tabjson.h

    - Fix MDEV-13353 No file privilege for ODBC, JDBC, MONGO, MAC, WMI file types.
      modified:   storage/connect/ha_connect.cc

    - Make some Json UDFs  to accept a non JSON item as 1st parameter.
      modified:   storage/connect/json.cpp
      modified:   storage/connect/json.h
      modified:   storage/connect/jsonudf.cpp
      modified:   storage/connect/jsonudf.h

    - Update Json UDF tests to cope with above changes.
      modified:   storage/connect/mysql-test/connect/r/json_udf.result
      modified:   storage/connect/mysql-test/connect/r/json_udf_bin.result
      modified:   storage/connect/mysql-test/connect/r/vcol.result
      modified:   storage/connect/mysql-test/connect/t/json_udf.test
      modified:   storage/connect/mysql-test/connect/t/vcol.test

    - Fix some compiler warning treated as error
      PlugSubAlloc no more exported because it does throw.
      modified:   storage/connect/global.h
      modified:   storage/connect/ha_connect.cc
      modified:   storage/connect/jsonudf.cpp
      modified:   storage/connect/tabjson.cpp
      modified:   storage/connect/tabjson.h

    - Other files modified (?) when going back to wrong merge
      modified:   storage/connect/CMakeLists.txt
      modified:   storage/connect/array.cpp
      modified:   storage/connect/colblk.cpp
      modified:   storage/connect/connect.cc
      modified:   storage/connect/csort.cpp
      modified:   storage/connect/domdoc.cpp
      modified:   storage/connect/filamap.cpp
      modified:   storage/connect/filamgz.cpp
      modified:   storage/connect/filamtxt.cpp
      modified:   storage/connect/filamzip.cpp
      modified:   storage/connect/filter.cpp
      modified:   storage/connect/fmdlex.c
      modified:   storage/connect/jdbconn.cpp
      modified:   storage/connect/macutil.cpp
      modified:   storage/connect/myconn.cpp
      modified:   storage/connect/odbconn.cpp
      modified:   storage/connect/plgdbutl.cpp
      modified:   storage/connect/plugutil.cpp
      modified:   storage/connect/preparse.h
      modified:   storage/connect/rcmsg.c
      modified:   storage/connect/rcmsg.h
      modified:   storage/connect/reldef.cpp
      modified:   storage/connect/tabdos.cpp
      modified:   storage/connect/tabfmt.cpp
      modified:   storage/connect/tabmac.cpp
      modified:   storage/connect/tabmul.cpp
      modified:   storage/connect/tabmysql.cpp
      modified:   storage/connect/tabmysql.h
      modified:   storage/connect/tabodbc.cpp
      modified:   storage/connect/tabtbl.cpp
      modified:   storage/connect/tabxml.cpp
      modified:   storage/connect/value.cpp
      modified:   storage/connect/xobject.cpp

commit 5095628b31ed8c94bd7c794c6b0162894a9040b1
Author: Olivier Bertrand <bertrandop@gmail.com>
Date:   Tue Feb 13 14:29:00 2018 +0100

    - Fix a bug causing CONNECT to loop when expanding a JSON column
      when the expanded column value is null or void array.
    - Adding the FullArray option to JSON tables.
    - Skipping expanded JSON lines when the expanded column value is null.
      modified:   storage/connect/connect.cc
      modified:   storage/connect/tabdos.h
      modified:   storage/connect/tabjson.cpp
      modified:   storage/connect/tabjson.h

commit 9896174328da42016735630c893fd09eb128b48e
Author: Olivier Bertrand <bertrandop@gmail.com>
Date:   Fri Feb 2 15:48:57 2018 +0100

    - Remove warning on not used tabtyp variable in connect_assisted_discovery
      modified:   storage/connect/ha_connect.cc

commit d7e254c05f88173eb04d8dafc813013eb42ccdbe
Author: Olivier Bertrand <bertrandop@gmail.com>
Date:   Wed Jan 31 14:42:45 2018 +0100

    - Use delayed load for the MongoDB C Drive on Windows
      modified:   storage/connect/CMakeLists.txt
      modified:   storage/connect/cmgoconn.cpp
      modified:   storage/connect/ha_connect.cc

    - Add FORCE to the connect_type_conv enum values
      This will translate binary values to TYPE_STRING
      modified:   storage/connect/checklvl.h
      modified:   storage/connect/ha_connect.cc
      modified:   storage/connect/odbconn.cpp

    - Change the connect_xtrace variable to from int to set
      modified:   storage/connect/array.cpp
      modified:   storage/connect/blkfil.cpp
      modified:   storage/connect/block.h
      modified:   storage/connect/cmgoconn.cpp
      modified:   storage/connect/colblk.cpp
      modified:   storage/connect/connect.cc
      modified:   storage/connect/filamap.cpp
      modified:   storage/connect/filamdbf.cpp
      modified:   storage/connect/filamfix.cpp
      modified:   storage/connect/filamgz.cpp
      modified:   storage/connect/filamtxt.cpp
      modified:   storage/connect/filamvct.cpp
      modified:   storage/connect/filamzip.cpp
      modified:   storage/connect/filter.cpp
      modified:   storage/connect/global.h
      modified:   storage/connect/ha_connect.cc
      modified:   storage/connect/inihandl.cpp
      modified:   storage/connect/javaconn.cpp
      modified:   storage/connect/jdbconn.cpp
      modified:   storage/connect/jmgfam.cpp
      modified:   storage/connect/jmgoconn.cpp
      modified:   storage/connect/json.cpp
      modified:   storage/connect/jsonudf.cpp
      modified:   storage/connect/libdoc.cpp
      modified:   storage/connect/mongo.cpp
      modified:   storage/connect/mycat.cc
      modified:   storage/connect/myconn.cpp
      modified:   storage/connect/odbconn.cpp
      modified:   storage/connect/plgdbutl.cpp
      modified:   storage/connect/plugutil.cpp
      modified:   storage/connect/reldef.cpp
      modified:   storage/connect/tabcol.cpp
      modified:   storage/connect/tabdos.cpp
      modified:   storage/connect/tabext.cpp
      modified:   storage/connect/tabfix.cpp
      modified:   storage/connect/tabfmt.cpp
      modified:   storage/connect/tabjdbc.cpp
      modified:   storage/connect/tabjson.cpp
      modified:   storage/connect/table.cpp
      modified:   storage/connect/tabmul.cpp
      modified:   storage/connect/tabmysql.cpp
      modified:   storage/connect/tabodbc.cpp
      modified:   storage/connect/tabpivot.cpp
      modified:   storage/connect/tabsys.cpp
      modified:   storage/connect/tabtbl.cpp
      modified:   storage/connect/tabutil.cpp
      modified:   storage/connect/tabvct.cpp
      modified:   storage/connect/tabwmi.cpp
      modified:   storage/connect/tabxml.cpp
      modified:   storage/connect/user_connect.cc
      modified:   storage/connect/valblk.cpp
      modified:   storage/connect/value.cpp
      modified:   storage/connect/xindex.cpp

    - Restore connect_enable_mongo variable (but undocumented)
      modified:   storage/connect/ha_connect.cc
      modified:   storage/connect/mycat.cc
      modified:   storage/connect/mysql-test/connect/r/json_java_2.result
      modified:   storage/connect/mysql-test/connect/r/json_java_3.result
      modified:   storage/connect/mysql-test/connect/r/json_mongo_c.result
      modified:   storage/connect/mysql-test/connect/r/mongo_c.result
      modified:   storage/connect/mysql-test/connect/r/mongo_java_2.result
      modified:   storage/connect/mysql-test/connect/r/mongo_java_3.result
      modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
      modified:   storage/connect/mysql-test/connect/t/mongo.inc
      modified:   storage/connect/mysql-test/connect/t/mongo_test.inc
      modified:   storage/connect/mysql-test/connect/t/tbl_thread.test

1 files changed, 67 insertions, 76 deletions

diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp
index f669d644637..e296553d8e2 100644
--- a/storage/connect/plgdbutl.cpp
+++ b/storage/connect/plgdbutl.cpp
@@ -1,11 +1,11 @@
 /********** PlgDBUtl Fpe C++ Program Source Code File (.CPP) ***********/
 /* PROGRAM NAME: PLGDBUTL                                              */
 /* -------------                                                       */
-/*  Version 4.0                                                        */
+/*  Version 4.1                                                        */
 /*                                                                     */
 /* COPYRIGHT:                                                          */
 /* ----------                                                          */
-/*  (C) Copyright to the author Olivier BERTRAND          1998-2017    */
+/*  (C) Copyright to the author Olivier BERTRAND          1998-2018    */
 /*                                                                     */
 /* WHAT THIS PROGRAM DOES:                                             */
 /* -----------------------                                             */
@@ -215,35 +215,13 @@ int global_open(GLOBAL *g, int msgid, const char *path, int flags, int mode)
 }
 
 DllExport void SetTrc(void)
-  {
+{
   // If tracing is on, debug must be initialized.
   debug = pfile;
-  } // end of SetTrc
-
-#if 0
-/**************************************************************************/
-/*  Tracing output function.                                              */
-/**************************************************************************/
-void ptrc(char const *fmt, ...)
-  {
-  va_list ap;
-  va_start (ap, fmt);
-
-//  if (trace == 0 || (trace == 1 && !pfile) || !fmt)
-//    printf("In %s wrong trace=%d pfile=%p fmt=%p\n", 
-//      __FILE__, trace, pfile, fmt);
-
-  if (trace == 1)
-    vfprintf(pfile, fmt, ap);
-  else
-    vprintf(fmt, ap);
-
-  va_end (ap);
-  } // end of ptrc
-#endif // 0
+} // end of SetTrc
 
 /**************************************************************************/
-/*  Allocate the result structure that will contain result data.          */
+/*  SubAllocate the result structure that will contain result data.       */
 /**************************************************************************/
 PQRYRES PlgAllocResult(PGLOBAL g, int ncol, int maxres, int ids,
                        int *buftyp, XFLD *fldtyp, 
@@ -307,7 +285,7 @@ PQRYRES PlgAllocResult(PGLOBAL g, int ncol, int maxres, int ids,
 			else
 				crp->Kdata = NULL;
 
-			if (trace)
+			if (trace(1))
 				htrc("Column(%d) %s type=%d len=%d value=%p\n",
 					crp->Ncol, crp->Name, crp->Type, crp->Length, crp->Kdata);
 
@@ -475,7 +453,7 @@ bool PlugEvalLike(PGLOBAL g, LPCSTR strg, LPCSTR pat, bool ci)
   char *tp, *sp;
   bool  b;
 
-  if (trace)
+  if (trace(2))
     htrc("LIKE: strg='%s' pattern='%s'\n", strg, pat);
 
   if (ci) {                        /* Case insensitive test             */
@@ -541,10 +519,10 @@ bool EvalLikePattern(LPCSTR sp, LPCSTR tp)
   {
   LPSTR p;
   char  c;
-  int   n;
+  ssize_t   n;
   bool  b, t = false;
 
-  if (trace)
+  if (trace(2))
     htrc("Eval Like: sp=%s tp=%s\n", 
          (sp) ? sp : "Null", (tp) ? tp : "Null");
 
@@ -582,7 +560,7 @@ bool EvalLikePattern(LPCSTR sp, LPCSTR tp)
   else
     n = strlen(tp);                   /* Get length of pattern head    */
 
-  if (trace)
+  if (trace(2))
     htrc(" testing: t=%d sp=%s tp=%s p=%p\n", t, sp, tp, p);
 
   if (n > (signed)strlen(sp))         /* If head is longer than strg   */
@@ -628,7 +606,7 @@ bool EvalLikePattern(LPCSTR sp, LPCSTR tp)
       b = !strcmp(sp, tp);
     } /* endif p */
 
-  if (trace)
+  if (trace(2))
     htrc(" done: b=%d n=%d sp=%s tp=%s\n",
           b, n, (sp) ? sp : "Null", tp);
 
@@ -668,7 +646,7 @@ char *MakeEscape(PGLOBAL g, char* str, char q)
 /***********************************************************************/
 void PlugConvertConstant(PGLOBAL g, void* & value, short& type)
   {
-  if (trace)
+  if (trace(1))
     htrc("PlugConvertConstant: value=%p type=%hd\n", value, type);
 
   if (type != TYPE_XOBJECT) {
@@ -688,7 +666,7 @@ PDTP MakeDateFormat(PGLOBAL g, PCSZ dfmt, bool in, bool out, int flag)
 	int  rc;
   PDTP pdp = (PDTP)PlugSubAlloc(g, NULL, sizeof(DATPAR));
 
-  if (trace)
+  if (trace(1))
     htrc("MakeDateFormat: dfmt=%s\n", dfmt);
 
   memset(pdp, 0, sizeof(DATPAR));
@@ -711,7 +689,7 @@ PDTP MakeDateFormat(PGLOBAL g, PCSZ dfmt, bool in, bool out, int flag)
   rc = fmdflex(pdp);
   pthread_mutex_unlock(&parmut);
 
-  if (trace)
+  if (trace(1))
     htrc("Done: in=%s out=%s rc=%d\n", SVP(pdp->InFmt), SVP(pdp->OutFmt), rc);
 
   return pdp;
@@ -733,7 +711,7 @@ int ExtractDate(char *dts, PDTP pdp, int defy, int val[6])
   else            // assume standard MySQL date format
     fmt = "%4d-%2d-%2d %2d:%2d:%2d";
 
-  if (trace > 1)
+  if (trace(2))
     htrc("ExtractDate: dts=%s fmt=%s defy=%d\n", dts, fmt, defy);
 
   // Set default values for time only use
@@ -816,7 +794,7 @@ int ExtractDate(char *dts, PDTP pdp, int defy, int val[6])
 
     } // endfor i
 
-  if (trace > 1)
+  if (trace(2))
     htrc("numval=%d val=(%d,%d,%d,%d,%d,%d)\n",
           numval, val[0], val[1], val[2], val[3], val[4], val[5]); 
 
@@ -833,18 +811,18 @@ FILE *PlugOpenFile(PGLOBAL g, LPCSTR fname, LPCSTR ftype)
   PFBLOCK   fp;
   PDBUSER   dbuserp = (PDBUSER)g->Activityp->Aptr;
 
-  if (trace) {
+  if (trace(1)) {
     htrc("PlugOpenFile: fname=%s ftype=%s\n", fname, ftype);
     htrc("dbuserp=%p\n", dbuserp);
     } // endif trace
 
   if ((fop= global_fopen(g, MSGID_OPEN_MODE_STRERROR, fname, ftype)) != NULL) {
-    if (trace)
+    if (trace(1))
       htrc(" fop=%p\n", fop);
 
     fp = (PFBLOCK)PlugSubAlloc(g, NULL, sizeof(FBLOCK));
 
-    if (trace)
+    if (trace(1))
       htrc(" fp=%p\n", fp);
 
     // fname may be in volatile memory such as stack
@@ -857,7 +835,7 @@ FILE *PlugOpenFile(PGLOBAL g, LPCSTR fname, LPCSTR ftype)
     dbuserp->Openlist = fp;
     } /* endif fop */
 
-  if (trace)
+  if (trace(1))
     htrc(" returning fop=%p\n", fop);
 
   return (fop);
@@ -888,7 +866,7 @@ int PlugCloseFile(PGLOBAL g, PFBLOCK fp, bool all)
   {
   int rc = 0;
 
-  if (trace)
+  if (trace(1))
     htrc("PlugCloseFile: fp=%p count=%hd type=%hd\n",
           fp, ((fp) ? fp->Count : 0), ((fp) ? fp->Type : 0));
 
@@ -1050,7 +1028,7 @@ int GetIniSize(char *section, char *key, char *def, char *ini)
         n *= 1024;
       } // endswitch c
 
-  if (trace)
+  if (trace(1))
     htrc("GetIniSize: key=%s buff=%s i=%d n=%d\n", key, buff, i, n);
 
   return n;
@@ -1086,7 +1064,7 @@ DllExport PSZ GetIniString(PGLOBAL g, void *mp, LPCSTR sec, LPCSTR key,
 
   p = (PSZ)PlugSubAlloc(g, mp, n + 1);
 
-  if (trace)
+  if (trace(1))
     htrc("GetIniString: sec=%s key=%s buf=%s\n", sec, key, buf);
 
   strcpy(p, buf);
@@ -1237,7 +1215,7 @@ char *GetExceptionDesc(PGLOBAL g, unsigned int e)
 /*  so it can be freed at the normal or error query completion.        */
 /***********************************************************************/
 void *PlgDBalloc(PGLOBAL g, void *area, MBLOCK& mp)
-  {
+{
 //bool        b;
   size_t      maxsub, minsub;
   void       *arp = (area) ? area : g->Sarea;
@@ -1253,7 +1231,7 @@ void *PlgDBalloc(PGLOBAL g, void *area, MBLOCK& mp)
     // done to check whether the block is already there.
 //  b = mp.Sub;
     mp.Sub = false;    // Restrict suballocation to one quarter
-    } // endif Memp
+  } // endif Memp
 
   // Suballoc when possible if mp.Sub is initially true, but leaving
   // a minimum amount of storage for future operations such as the
@@ -1263,35 +1241,40 @@ void *PlgDBalloc(PGLOBAL g, void *area, MBLOCK& mp)
   maxsub = (pph->FreeBlk < minsub) ? 0 : pph->FreeBlk - minsub;
   mp.Sub = mp.Size <= ((mp.Sub) ? maxsub : (maxsub >> 2));
 
-  if (trace > 1)
-    htrc("PlgDBalloc: in %p size=%d used=%d free=%d sub=%d\n",
-          arp, mp.Size, pph->To_Free, pph->FreeBlk, mp.Sub);
+	if (trace(2))
+		htrc("PlgDBalloc: in %p size=%d used=%d free=%d sub=%d\n",
+			arp, mp.Size, pph->To_Free, pph->FreeBlk, mp.Sub);
 
-  if (!mp.Sub) {
+	if (!mp.Sub) {
     // For allocations greater than one fourth of remaining storage
     // in the area, do allocate from virtual storage.
+		const char*v = "malloc";
 #if defined(__WIN__)
-    if (mp.Size >= BIGMEM)
-      mp.Memp = VirtualAlloc(NULL, mp.Size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-    else
+		if (mp.Size >= BIGMEM) {
+			v = "VirtualAlloc";
+			mp.Memp = VirtualAlloc(NULL, mp.Size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+		} else
 #endif
       mp.Memp = malloc(mp.Size);
 
-    if (!mp.Inlist && mp.Memp) {
+		if (trace(8))
+			htrc("PlgDBalloc: %s(%d) at %p\n", v, mp.Size, mp.Memp);
+
+		if (!mp.Inlist && mp.Memp) {
       // New allocated block, put it in the memory block chain.
       PDBUSER dbuserp = (PDBUSER)g->Activityp->Aptr;
 
       mp.Next = dbuserp->Memlist;
       dbuserp->Memlist = &mp;
       mp.Inlist = true;
-      } // endif mp
+    } // endif mp
 
   } else
     // Suballocating is Ok.
     mp.Memp = PlugSubAlloc(g, area, mp.Size);
 
   return mp.Memp;
-  } // end of PlgDBalloc
+} // end of PlgDBalloc
 
 /***********************************************************************/
 /*  PlgDBrealloc: reallocates memory conditionally.                    */
@@ -1306,7 +1289,7 @@ void *PlgDBrealloc(PGLOBAL g, void *area, MBLOCK& mp, size_t newsize)
 //  assert (mp.Memp != NULL);
 #endif
 
-  if (trace > 1)
+  if (trace(2))
     htrc("PlgDBrealloc: %p size=%d sub=%d\n", mp.Memp, mp.Size, mp.Sub);
 
   if (newsize == mp.Size)
@@ -1326,10 +1309,14 @@ void *PlgDBrealloc(PGLOBAL g, void *area, MBLOCK& mp, size_t newsize)
       mp.Memp = PlugSubAlloc(g, area, newsize);
       memcpy(mp.Memp, m.Memp, MY_MIN(m.Size, newsize));
       PlgDBfree(m);    // Free the old block
-    } else if (!(mp.Memp = realloc(mp.Memp, newsize))) {
-      mp = m;          // Possible only if newsize > Size
-      return NULL;     // Failed
-    } // endif's
+    } else {
+			if (!(mp.Memp = realloc(mp.Memp, newsize))) {
+				mp = m;          // Possible only if newsize > Size
+				return NULL;     // Failed
+			} else if (trace(8))
+				htrc("PlgDBrealloc: realloc(%ld) at %p\n", newsize, mp.Memp);
+
+		} // endif's
 
     mp.Size = newsize;
   } else if (!mp.Sub || newsize > mp.Size) {
@@ -1352,7 +1339,7 @@ void *PlgDBrealloc(PGLOBAL g, void *area, MBLOCK& mp, size_t newsize)
 
   } // endif's
 
-  if (trace)
+  if (trace(8))
     htrc(" newsize=%d newp=%p sub=%d\n", mp.Size, mp.Memp, mp.Sub);
 
   return mp.Memp;
@@ -1363,16 +1350,20 @@ void *PlgDBrealloc(PGLOBAL g, void *area, MBLOCK& mp, size_t newsize)
 /***********************************************************************/
 void PlgDBfree(MBLOCK& mp)
   {
-  if (trace > 1)
-    htrc("PlgDBfree: %p sub=%d size=%d\n", mp.Memp, mp.Sub, mp.Size);
-
-  if (!mp.Sub && mp.Memp)
+	if (!mp.Sub && mp.Memp) {
+		const char*v = "free";
 #if defined(__WIN__)
-    if (mp.Size >= BIGMEM)
-      VirtualFree(mp.Memp, 0, MEM_RELEASE);
-    else
+		if (mp.Size >= BIGMEM) {
+			v = "VirtualFree";
+			VirtualFree(mp.Memp, 0, MEM_RELEASE);
+		} else
 #endif
-      free(mp.Memp);
+			free(mp.Memp);
+
+		if (trace(8))
+			htrc("PlgDBfree: %s(%p) size=%d\n", v, mp.Memp, mp.Size);
+
+	}	// endif mp
 
   // Do not reset Next to avoid cutting the Mblock chain
   mp.Memp = NULL;
@@ -1384,7 +1375,7 @@ void PlgDBfree(MBLOCK& mp)
 /*  Program for sub-allocating one item in a storage area.             */
 /*  Note: This function is equivalent to PlugSubAlloc except that in   */
 /*  case of insufficient memory, it returns NULL instead of doing a    */
-/*  long jump. The caller must test the return value for error.        */
+/*  throw. The caller must test the return value for error.            */
 /***********************************************************************/
 void *PlgDBSubAlloc(PGLOBAL g, void *memp, size_t size)
   {
@@ -1400,7 +1391,7 @@ void *PlgDBSubAlloc(PGLOBAL g, void *memp, size_t size)
   size = ((size + 7) / 8) * 8;       /* Round up size to multiple of 8 */
   pph = (PPOOLHEADER)memp;
 
-  if (trace > 1)
+  if (trace(16))
     htrc("PlgDBSubAlloc: memp=%p size=%d used=%d free=%d\n",
          memp, size, pph->To_Free, pph->FreeBlk);
 
@@ -1409,7 +1400,7 @@ void *PlgDBSubAlloc(PGLOBAL g, void *memp, size_t size)
     "Not enough memory in Work area for request of %d (used=%d free=%d)",
             (int) size, pph->To_Free, pph->FreeBlk);
 
-    if (trace)
+    if (trace(1))
       htrc("%s\n", g->Message);
 
     return NULL;
@@ -1422,7 +1413,7 @@ void *PlgDBSubAlloc(PGLOBAL g, void *memp, size_t size)
   pph->To_Free += size;                 // New offset of pool free block
   pph->FreeBlk -= size;                 // New size   of pool free block
 
-  if (trace > 1)
+  if (trace(16))
     htrc("Done memp=%p used=%d free=%d\n",
          memp, pph->To_Free, pph->FreeBlk);
 
@@ -1453,7 +1444,7 @@ void PlugPutOut(PGLOBAL g, FILE *f, short t, void *v, uint n)
   {
   char  m[64];
 
-  if (trace)
+  if (trace(1))
     htrc("PUTOUT: f=%p t=%d v=%p n=%d\n", f, t, v, n);
 
   if (!v)