Fix wrong value of JSON column

When null and the column is NOT NULL the value was not reset.
  modified:   storage/connect/tabjson.cpp

Fix converting bstr_t string to set error message
  modified:   storage/connect/domdoc.cpp

Fix MDEV-12768: -Wformat-overflow compile warnings
  modified:   storage/connect/global.h
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/plugutil.cpp
  modified:   storage/connect/tabvct.cpp

Typo (in external_lock)
  modified:   storage/connect/ha_connect.cc

Remove some warnings
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/tabmysql.cpp

Add MEM_RESERVE flag to virtualAlloc
  modified:   storage/connect/plgdbutl.cpp

Fix MDEV-12573:
Accept=1 may show incorrect value for NULL column in CONNECT TBL
  modified:   storage/connect/tabutil.cpp

Fix wrong setting of key size when greater than 2G
 modified:   storage/connect/xindex.cpp

Fixing MDEV-12149: compile errors on Windows with /Zc:strictStrings
Introduce typedef PCSZ and replace PSZ by it where it matters
All done on CONNECT but compile still fails because of an included system file
  modified:   storage/connect/array.cpp
  modified:   storage/connect/catalog.h
  modified:   storage/connect/colblk.cpp
  modified:   storage/connect/colblk.h
  modified:   storage/connect/connect.cc
  modified:   storage/connect/domdoc.cpp
  modified:   storage/connect/domdoc.h
  modified:   storage/connect/filamdbf.cpp
  modified:   storage/connect/filamdbf.h
  modified:   storage/connect/filamfix.cpp
  modified:   storage/connect/filamgz.cpp
  modified:   storage/connect/filamtxt.h
  modified:   storage/connect/filamvct.cpp
  modified:   storage/connect/filamvct.h
  modified:   storage/connect/filamzip.cpp
  modified:   storage/connect/filamzip.h
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/ha_connect.h
  modified:   storage/connect/jdbccat.h
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h
  modified:   storage/connect/json.cpp
  modified:   storage/connect/json.h
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/jsonudf.h
  modified:   storage/connect/libdoc.cpp
  modified:   storage/connect/macutil.cpp
  modified:   storage/connect/myconn.cpp
  modified:   storage/connect/myutil.cpp
  modified:   storage/connect/myutil.h
  modified:   storage/connect/odbccat.h
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/odbconn.h
  modified:   storage/connect/os.h
  modified:   storage/connect/plgdbsem.h
  modified:   storage/connect/plgdbutl.cpp
  modified:   storage/connect/plgxml.cpp
  modified:   storage/connect/plgxml.h
  modified:   storage/connect/plugutil.cpp
  modified:   storage/connect/preparse.h
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/reldef.h
  modified:   storage/connect/tabdos.cpp
  modified:   storage/connect/tabdos.h
  modified:   storage/connect/tabext.cpp
  modified:   storage/connect/tabext.h
  modified:   storage/connect/tabfix.cpp
  modified:   storage/connect/tabfix.h
  modified:   storage/connect/tabfmt.cpp
  modified:   storage/connect/tabfmt.h
  modified:   storage/connect/tabjdbc.cpp
  modified:   storage/connect/tabjdbc.h
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h
  modified:   storage/connect/table.cpp
  modified:   storage/connect/tabmac.cpp
  modified:   storage/connect/tabmul.cpp
  modified:   storage/connect/tabmul.h
  modified:   storage/connect/tabmysql.cpp
  modified:   storage/connect/tabmysql.h
  modified:   storage/connect/tabodbc.cpp
  modified:   storage/connect/tabodbc.h
  modified:   storage/connect/tabpivot.cpp
  modified:   storage/connect/tabpivot.h
  modified:   storage/connect/tabsys.cpp
  modified:   storage/connect/tabsys.h
  modified:   storage/connect/tabutil.cpp
  modified:   storage/connect/tabutil.h
  modified:   storage/connect/tabvir.cpp
  modified:   storage/connect/tabvir.h
  modified:   storage/connect/tabwmi.cpp
  modified:   storage/connect/tabwmi.h
  modified:   storage/connect/tabxml.cpp
  modified:   storage/connect/tabxml.h
  modified:   storage/connect/tabzip.cpp
  modified:   storage/connect/tabzip.h
  modified:   storage/connect/valblk.cpp
  modified:   storage/connect/valblk.h
  modified:   storage/connect/value.cpp
  modified:   storage/connect/value.h
  modified:   storage/connect/xindex.cpp
  modified:   storage/connect/xobject.cpp
  modified:   storage/connect/xobject.h
  modified:   storage/connect/xtable.h

Fix MDEV-12603 Insert replaces values in ZIP file
  modified:   storage/connect/filamzip.cpp
  modified:   storage/connect/filamzip.h

Fix MDEV-12686 Handle null in json
Fix MDEV-12688 Insert does not handle type TINYINT
  modified:   storage/connect/json.cpp
  modified:   storage/connect/tabjson.cpp

Fix MDEV-12653 Cannot add index for ZIP CONNECT table
  modified:   storage/connect/filamzip.cpp
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/tabdos.cpp
  modified:   storage/connect/tabfmt.cpp
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/xindex.cpp

1 files changed, 219 insertions, 370 deletions

diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc
index 5d5eca80275..e15cc724b85 100644
--- a/storage/connect/connect.cc
+++ b/storage/connect/connect.cc
@@ -12,7 +12,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
 
 /***********************************************************************/
 /*  Author Olivier BERTRAND  bertrandop@gmail.com         2004-2017    */
@@ -121,8 +121,6 @@ bool CntCheckDB(PGLOBAL g, PHC handler, const char *pathname)
 		return true;
 
   if (dbuserp->Catalog) {
-//  ((MYCAT *)dbuserp->Catalog)->SetHandler(handler);   done later
-//  ((MYCAT *)dbuserp->Catalog)->SetDataPath(g, pathname);
     return false;                       // Nothing else to do
     } // endif Catalog
 
@@ -139,9 +137,6 @@ bool CntCheckDB(PGLOBAL g, PHC handler, const char *pathname)
   if (!(dbuserp->Catalog= new MYCAT(handler)))
     return true;
 
-//((MYCAT *)dbuserp->Catalog)->SetDataPath(g, pathname);
-//dbuserp->UseTemp= TMP_AUTO;
-
   /*********************************************************************/
   /*  All is correct.                                                  */
   /*********************************************************************/
@@ -173,7 +168,7 @@ bool CntInfo(PGLOBAL g, PTDB tp, PXF info)
 
 //  info->mean_rec_length= tdbp->GetLrecl();
     info->mean_rec_length= 0;
-    info->data_file_name= (b) ? NULL : tdbp->GetFile(g);
+    info->data_file_name= (b) ? NULL : (char*)tdbp->GetFile(g);
     return true;
   } else {
     info->data_file_length= 0;
@@ -201,50 +196,31 @@ PTDB CntGetTDB(PGLOBAL g, LPCSTR name, MODE mode, PHC h)
 	if (!cat)
 		return NULL;
 
-#if defined(USE_TRY)
 	try {
-#else   // !USE_TRY
-	// Save stack and allocation environment and prepare error return
-	if (g->jump_level == MAX_JUMP) {
-		strcpy(g->Message, MSG(TOO_MANY_JUMPS));
-		return NULL;
-	} // endif jump_level
-
-	if (setjmp(g->jumper[++g->jump_level])) {
-		tdbp = NULL;
-		goto err;
-	} // endif rc
-#endif  // !USE_TRY
+		// Get table object from the catalog
+		tabp = new(g) XTAB(name);
 
-	// Get table object from the catalog
-	tabp = new(g) XTAB(name);
-
-	if (trace)
-		printf("CntGetTDB: tabp=%p\n", tabp);
+		if (trace)
+			printf("CntGetTDB: tabp=%p\n", tabp);
 
-	// Perhaps this should be made thread safe
-	((MYCAT*)cat)->SetHandler(h);
+		// Perhaps this should be made thread safe
+		((MYCAT*)cat)->SetHandler(h);
 
-	if (!(tdbp = cat->GetTable(g, tabp, mode)))
-		printf("CntGetTDB: %s\n", g->Message);
+		if (!(tdbp = cat->GetTable(g, tabp, mode)))
+			printf("CntGetTDB: %s\n", g->Message);
 
-#if defined(USE_TRY)
 	} catch (int n) {
 		if (trace)
 			htrc("Exception %d: %s\n", n, g->Message);
   } catch (const char *msg) {
 		strcpy(g->Message, msg);
 	}	// end catch
-#else   // !USE_TRY
-err:
-	g->jump_level--;
-#endif  // !USE_TRY
 
   if (trace)
     printf("Returning tdbp=%p mode=%d\n", tdbp, mode);
 
   return tdbp;
-  } // end of CntGetTDB
+} // end of CntGetTDB
 
 /***********************************************************************/
 /*  OPENTAB: Open a Table.                                             */
@@ -268,161 +244,116 @@ bool CntOpenTable(PGLOBAL g, PTDB tdbp, MODE mode, char *c1, char *c2,
     return true;
     } // endif tdbp
 
-#if defined(USE_TRY)
 	try {
-#else   // !USE_TRY
-	// Save stack and allocation environment and prepare error return
-	if (g->jump_level == MAX_JUMP) {
-		strcpy(g->Message, MSG(TOO_MANY_JUMPS));
-		return true;
-	} // endif jump_level
-
-	if (setjmp(g->jumper[++g->jump_level])) {
-		goto err;
-	} // endif rc
-#endif  // !USE_TRY
-
-  if (!c1) {
-    if (mode == MODE_INSERT)
-      // Allocate all column blocks for that table
-      tdbp->ColDB(g, NULL, 0);
-
-  } else for (p= c1; *p; p+= n) {
-    // Allocate only used column blocks
-    if (trace)
-      printf("Allocating column %s\n", p);
-
-    g->Message[0] = 0;    // To check whether ColDB made an error message
-    colp= tdbp->ColDB(g, p, 0);
-
-    if (!colp && !(mode == MODE_INSERT && tdbp->IsSpecial(p))) {
-      if (g->Message[0] == 0)
-        sprintf(g->Message, MSG(COL_ISNOT_TABLE), p, tdbp->GetName());
-
-#if defined(USE_TRY)
-			throw 1;
-#else   // !USE_TRY
-			goto err;
-#endif  // !USE_TRY
-      } // endif colp
-
-    n= strlen(p) + 1;
-    } // endfor p
-
-  for (i= 0, colp= tdbp->GetColumns(); colp; i++, colp= colp->GetNext()) {
-    if (colp->InitValue(g))
-#if defined(USE_TRY)
-			throw 2;
-#else   // !USE_TRY
-			goto err;
-#endif  // !USE_TRY
-
-    if (mode == MODE_INSERT)
-      // Allow type conversion
-      if (colp->SetBuffer(g, colp->GetValue(), true, false))
-#if defined(USE_TRY)
-				throw 3;
-#else   // !USE_TRY
-				goto err;
-#endif  // !USE_TRY
-
-    colp->AddColUse(U_P);           // For PLG tables
-    } // endfor colp
-
-  /*********************************************************************/
-  /*  In Update mode, the updated column blocks must be distinct from  */
-  /*  the read column blocks. So make a copy of the TDB and allocate   */
-  /*  its column blocks in mode write (required by XML tables).        */
-  /*********************************************************************/
-  if (mode == MODE_UPDATE) {
-    PTDBASE utp;
-
-    if (!(utp= (PTDBASE)tdbp->Duplicate(g))) {
-      sprintf(g->Message, MSG(INV_UPDT_TABLE), tdbp->GetName());
-#if defined(USE_TRY)
-			throw 4;
-#else   // !USE_TRY
-			goto err;
-#endif  // !USE_TRY
-		} // endif tp
-
-    if (!c2)
-      // Allocate all column blocks for that table
-      utp->ColDB(g, NULL, 0);
-    else for (p= c2; *p; p+= n) {
-      // Allocate only used column blocks
-      colp= utp->ColDB(g, p, 0);
-      n= strlen(p) + 1;
-      } // endfor p
-
-    for (i= 0, colp= utp->GetColumns(); colp; i++, colp= colp->GetNext()) {
-      if (colp->InitValue(g))
-#if defined(USE_TRY)
-				throw 5;
-#else   // !USE_TRY
-				goto err;
-#endif  // !USE_TRY
-
-      if (colp->SetBuffer(g, colp->GetValue(), true, false))
-#if defined(USE_TRY)
-				throw 6;
-#else   // !USE_TRY
-				goto err;
-#endif  // !USE_TRY
-
-      } // endfor colp
-
-    // Attach the updated columns list to the main table
-    tdbp->SetSetCols(utp->GetColumns());
-  } else if (tdbp && mode == MODE_INSERT)
-    tdbp->SetSetCols(tdbp->GetColumns());
-
-  // Now do open the physical table
-  if (trace)
-    printf("Opening table %s in mode %d tdbp=%p\n",
-           tdbp->GetName(), mode, tdbp);
+		if (!c1) {
+			if (mode == MODE_INSERT)
+				// Allocate all column blocks for that table
+				tdbp->ColDB(g, NULL, 0);
+
+		} else for (p = c1; *p; p += n) {
+			// Allocate only used column blocks
+			if (trace)
+				printf("Allocating column %s\n", p);
+
+			g->Message[0] = 0;    // To check whether ColDB made an error message
+			colp = tdbp->ColDB(g, p, 0);
+
+			if (!colp && !(mode == MODE_INSERT && tdbp->IsSpecial(p))) {
+				if (g->Message[0] == 0)
+					sprintf(g->Message, MSG(COL_ISNOT_TABLE), p, tdbp->GetName());
+
+				throw 1;
+			} // endif colp
+
+			n = strlen(p) + 1;
+		} // endfor p
+
+		for (i = 0, colp = tdbp->GetColumns(); colp; i++, colp = colp->GetNext()) {
+			if (colp->InitValue(g))
+				throw 2;
+
+			if (mode == MODE_INSERT)
+				// Allow type conversion
+				if (colp->SetBuffer(g, colp->GetValue(), true, false))
+					throw 3;
+
+			colp->AddColUse(U_P);           // For PLG tables
+		} // endfor colp
+
+		/*******************************************************************/
+		/* In Update mode, the updated column blocks must be distinct from */
+		/* the read column blocks. So make a copy of the TDB and allocate  */
+		/* its column blocks in mode write (required by XML tables).       */
+		/*******************************************************************/
+		if (mode == MODE_UPDATE) {
+			PTDBASE utp;
+
+			if (!(utp = (PTDBASE)tdbp->Duplicate(g))) {
+				sprintf(g->Message, MSG(INV_UPDT_TABLE), tdbp->GetName());
+				throw 4;
+			} // endif tp
+
+			if (!c2)
+				// Allocate all column blocks for that table
+				utp->ColDB(g, NULL, 0);
+			else for (p = c2; *p; p += n) {
+				// Allocate only used column blocks
+				colp = utp->ColDB(g, p, 0);
+				n = strlen(p) + 1;
+			} // endfor p
+
+			for (i = 0, colp = utp->GetColumns(); colp; i++, colp = colp->GetNext()) {
+				if (colp->InitValue(g))
+					throw 5;
+
+				if (colp->SetBuffer(g, colp->GetValue(), true, false))
+					throw 6;
+
+			} // endfor colp
+
+		// Attach the updated columns list to the main table
+			tdbp->SetSetCols(utp->GetColumns());
+		} else if (tdbp && mode == MODE_INSERT)
+			tdbp->SetSetCols(tdbp->GetColumns());
+
+		// Now do open the physical table
+		if (trace)
+			printf("Opening table %s in mode %d tdbp=%p\n",
+				tdbp->GetName(), mode, tdbp);
 
-//tdbp->SetMode(mode);
+		//tdbp->SetMode(mode);
 
-  if (del/* && (tdbp->GetFtype() != RECFM_NAF*/) {
-    // To avoid erasing the table when doing a partial delete
-    // make a fake Next
+		if (del/* && (tdbp->GetFtype() != RECFM_NAF*/) {
+			// To avoid erasing the table when doing a partial delete
+			// make a fake Next
 //    PDOSDEF ddp= new(g) DOSDEF;
 //    PTDB tp= new(g) TDBDOS(ddp, NULL);
-    tdbp->SetNext((PTDB)1);
-    dup->Check &= ~CHK_DELETE;
-    } // endif del
+			tdbp->SetNext((PTDB)1);
+			dup->Check &= ~CHK_DELETE;
+		} // endif del
 
 
-  if (trace)
-    printf("About to open the table: tdbp=%p\n", tdbp);
+		if (trace)
+			printf("About to open the table: tdbp=%p\n", tdbp);
 
-  if (mode != MODE_ANY && mode != MODE_ALTER) {
-    if (tdbp->OpenDB(g)) {
-      printf("%s\n", g->Message);
-#if defined(USE_TRY)
-			throw 7;
-#else   // !USE_TRY
-			goto err;
-#endif  // !USE_TRY
-		} else
-      tdbp->SetNext(NULL);
+		if (mode != MODE_ANY && mode != MODE_ALTER) {
+			if (tdbp->OpenDB(g)) {
+				printf("%s\n", g->Message);
+				throw 7;
+			} else
+				tdbp->SetNext(NULL);
 
-  } // endif mode
+		} // endif mode
 
-  rcop= false;
+		rcop = false;
 
-#if defined(USE_TRY)
 	} catch (int n) {
 		if (trace)
 			htrc("Exception %d: %s\n", n, g->Message);
 	} catch (const char *msg) {
 		strcpy(g->Message, msg);
 	} // end catch
-#else   // !USE_TRY
-err:
-	g->jump_level--;
-#endif  // !USE_TRY
+
   return rcop;
   } // end of CntOpenTable
 
@@ -442,65 +373,40 @@ bool CntRewindTable(PGLOBAL g, PTDB tdbp)
 /*  Evaluate all columns after a record is read.                       */
 /***********************************************************************/
 RCODE EvalColumns(PGLOBAL g, PTDB tdbp, bool reset, bool mrr)
-  {
+{
   RCODE rc= RC_OK;
   PCOL  colp;
 
-#if defined(USE_TRY)
 	try {
-#else   // !USE_TRY
-	// Save stack and allocation environment and prepare error return
-	if (g->jump_level == MAX_JUMP) {
-		if (trace) {
-			strcpy(g->Message, MSG(TOO_MANY_JUMPS));
-			printf("EvalColumns: %s\n", g->Message);
-		} // endif
+		for (colp = tdbp->GetColumns(); rc == RC_OK && colp;
+			colp = colp->GetNext()) {
+			if (reset)
+				colp->Reset();
 
-		return RC_FX;
-	} // endif jump_level
+			// Virtual columns are computed by MariaDB
+			if (!colp->GetColUse(U_VIRTUAL) && (!mrr || colp->GetKcol()))
+				if (colp->Eval(g))
+					rc = RC_FX;
 
-	if (setjmp(g->jumper[++g->jump_level]) != 0) {
+		} // endfor colp
+
+	} catch (int n) {
 		if (trace)
-			printf("Error reading columns: %s\n", g->Message);
+			printf("Error %d reading columns: %s\n", n, g->Message);
 
 		rc = RC_FX;
-		goto err;
-	} // endif rc
-#endif  // !USE_TRY
-
-  for (colp= tdbp->GetColumns(); rc == RC_OK && colp;
-       colp= colp->GetNext()) {
-    if (reset)
-      colp->Reset();
-
-    // Virtual columns are computed by MariaDB
-    if (!colp->GetColUse(U_VIRTUAL) && (!mrr || colp->GetKcol()))
-      if (colp->Eval(g))
-        rc= RC_FX;
-
-    } // endfor colp
+	} catch (const char *msg) {
+		strcpy(g->Message, msg);
+	} // end catch
 
-#if defined(USE_TRY)
-} catch (int n) {
-	if (trace)
-		printf("Error %d reading columns: %s\n", n, g->Message);
-
-	rc = RC_FX;
-} catch (const char *msg) {
-	strcpy(g->Message, msg);
-} // end catch
-#else   // !USE_TRY
-err:
-	g->jump_level--;
-#endif  // !USE_TRY
   return rc;
-  } // end of EvalColumns
+} // end of EvalColumns
 
 /***********************************************************************/
 /*  ReadNext: Read next record sequentially.                           */
 /***********************************************************************/
 RCODE CntReadNext(PGLOBAL g, PTDB tdbp)
-  {
+{
   RCODE rc;
 
   if (!tdbp)
@@ -515,103 +421,66 @@ RCODE CntReadNext(PGLOBAL g, PTDB tdbp)
     ((PTDBASE)tdbp)->ResetKindex(g, NULL);
     } // endif index
 
-#if defined(USE_TRY)
 	try {
-#else   // !USE_TRY
-	// Save stack and allocation environment and prepare error return
-	if (g->jump_level == MAX_JUMP) {
-		strcpy(g->Message, MSG(TOO_MANY_JUMPS));
-		return RC_FX;
-	} // endif jump_level
-
-	if ((setjmp(g->jumper[++g->jump_level])) != 0) {
-		rc = RC_FX;
-		goto err;
-	} // endif rc
-#endif  // !USE_TRY
+		// Do it now to avoid double eval when filtering
+		for (PCOL colp = tdbp->GetColumns(); colp; colp = colp->GetNext())
+			colp->Reset();
 
-  // Do it now to avoid double eval when filtering
-  for (PCOL colp= tdbp->GetColumns(); colp; colp= colp->GetNext())
-    colp->Reset();
+		do {
+			if ((rc = (RCODE)tdbp->ReadDB(g)) == RC_OK)
+				if (!ApplyFilter(g, tdbp->GetFilter()))
+					rc = RC_NF;
 
-  do {
-    if ((rc= (RCODE)tdbp->ReadDB(g)) == RC_OK)
-      if (!ApplyFilter(g, tdbp->GetFilter()))
-        rc= RC_NF;
+		} while (rc == RC_NF);
 
-    } while (rc == RC_NF);
+		if (rc == RC_OK)
+			rc = EvalColumns(g, tdbp, false);
 
-  if (rc == RC_OK)
-    rc= EvalColumns(g, tdbp, false);
-
-#if defined(USE_TRY)
-  } catch (int) {
+	} catch (int) {
 	  rc = RC_FX;
   } catch (const char *msg) {
 	  strcpy(g->Message, msg);
 		rc = RC_FX;
   } // end catch
-#else   // !USE_TRY
-err:
-	g->jump_level--;
-#endif  // !USE_TRY
+
   return rc;
-  } // end of CntReadNext
+} // end of CntReadNext
 
 /***********************************************************************/
 /*  WriteRow: Insert a new row into a table.                           */
 /***********************************************************************/
 RCODE  CntWriteRow(PGLOBAL g, PTDB tdbp)
-  {
-  RCODE   rc;
-  PCOL    colp;
-//PTDBASE tp= (PTDBASE)tdbp;
+{
+	RCODE   rc;
+	PCOL    colp;
+	//PTDBASE tp= (PTDBASE)tdbp;
 
-  if (!tdbp)
-    return RC_FX;
+	if (!tdbp)
+		return RC_FX;
 
-#if defined(USE_TRY)
 	try {
-#else   // !USE_TRY
-	// Save stack and allocation environment and prepare error return
-	if (g->jump_level == MAX_JUMP) {
-		strcpy(g->Message, MSG(TOO_MANY_JUMPS));
-		return RC_FX;
-	} // endif jump_level
+		// Store column values in table write buffer(s)
+		for (colp = tdbp->GetSetCols(); colp; colp = colp->GetNext())
+			if (!colp->GetColUse(U_VIRTUAL))
+				colp->WriteColumn(g);
+
+		if (tdbp->IsIndexed())
+			// Index values must be sorted before updating
+			rc = (RCODE)((PTDBDOS)tdbp)->GetTxfp()->StoreValues(g, true);
+		else
+			// Return result code from write operation
+			rc = (RCODE)tdbp->WriteDB(g);
 
-	if (setjmp(g->jumper[++g->jump_level]) != 0) {
-		printf("%s\n", g->Message);
+	} catch (int n) {
+		printf("Exception %d: %s\n", n, g->Message);
 		rc = RC_FX;
-		goto err;
-	} // endif rc
-#endif  // !USE_TRY
-
-  // Store column values in table write buffer(s)
-  for (colp= tdbp->GetSetCols(); colp; colp= colp->GetNext())
-    if (!colp->GetColUse(U_VIRTUAL))
-      colp->WriteColumn(g);
+	} catch (const char *msg) {
+		strcpy(g->Message, msg);
+		rc = RC_FX;
+	} // end catch
 
-  if (tdbp->IsIndexed())
-    // Index values must be sorted before updating
-    rc= (RCODE)((PTDBDOS)tdbp)->GetTxfp()->StoreValues(g, true);
-  else
-    // Return result code from write operation
-    rc= (RCODE)tdbp->WriteDB(g);
-
-#if defined(USE_TRY)
-} catch (int n) {
-	printf("Exception %d: %s\n", n, g->Message);
-	rc = RC_FX;
-} catch (const char *msg) {
-	strcpy(g->Message, msg);
-	rc = RC_FX;
-} // end catch
-#else   // !USE_TRY
-err:
-	g->jump_level--;
-#endif  // !USE_TRY
-  return rc;
-  } // end of CntWriteRow
+	return rc;
+} // end of CntWriteRow
 
 /***********************************************************************/
 /*  UpdateRow: Update a row into a table.                              */
@@ -659,98 +528,78 @@ RCODE  CntDeleteRow(PGLOBAL g, PTDB tdbp, bool all)
 /*  CLOSETAB: Close a table.                                           */
 /***********************************************************************/
 int CntCloseTable(PGLOBAL g, PTDB tdbp, bool nox, bool abort)
-  {
-  int     rc= RC_OK;
-//TDBASE *tbxp= (PTDBASE)tdbp;
+{
+	int     rc = RC_OK;
+	//TDBASE *tbxp= (PTDBASE)tdbp;
 
-  if (!tdbp)
-    return rc;                           // Nothing to do
-  else if (tdbp->GetUse() != USE_OPEN) {
-    if (tdbp->GetAmType() == TYPE_AM_XML)
-      tdbp->CloseDB(g);                  // Opened by GetMaxSize
+	if (!tdbp)
+		return rc;                           // Nothing to do
+	else if (tdbp->GetUse() != USE_OPEN) {
+		if (tdbp->GetAmType() == TYPE_AM_XML)
+			tdbp->CloseDB(g);                  // Opened by GetMaxSize
 
-    return rc;
-  } // endif !USE_OPEN
+		return rc;
+	} // endif !USE_OPEN
 
-  if (trace)
-    printf("CntCloseTable: tdbp=%p mode=%d nox=%d abort=%d\n", 
-                           tdbp, tdbp->GetMode(), nox, abort);
+	if (trace)
+		printf("CntCloseTable: tdbp=%p mode=%d nox=%d abort=%d\n",
+			tdbp, tdbp->GetMode(), nox, abort);
 
-  if (tdbp->GetMode() == MODE_DELETE && tdbp->GetUse() == USE_OPEN) {
-    if (tdbp->IsIndexed())
-      rc= ((PTDBDOS)tdbp)->GetTxfp()->DeleteSortedRows(g);
+	if (tdbp->GetMode() == MODE_DELETE && tdbp->GetUse() == USE_OPEN) {
+		if (tdbp->IsIndexed())
+			rc = ((PTDBDOS)tdbp)->GetTxfp()->DeleteSortedRows(g);
 
-    if (!rc)
-      rc= tdbp->DeleteDB(g, RC_EF);    // Specific A.M. delete routine
+		if (!rc)
+			rc = tdbp->DeleteDB(g, RC_EF);    // Specific A.M. delete routine
 
-  } else if (tdbp->GetMode() == MODE_UPDATE && tdbp->IsIndexed())
-    rc= ((PTDBDOX)tdbp)->Txfp->UpdateSortedRows(g);
+	} else if (tdbp->GetMode() == MODE_UPDATE && tdbp->IsIndexed())
+		rc = ((PTDBDOX)tdbp)->Txfp->UpdateSortedRows(g);
 
-  switch(rc) {
-    case RC_FX:
-      abort= true;
-      break;
-    case RC_INFO:
-      PushWarning(g, tdbp);
-      break;
-    } // endswitch rc
+	switch (rc) {
+		case RC_FX:
+			abort = true;
+			break;
+		case RC_INFO:
+			PushWarning(g, tdbp);
+			break;
+	} // endswitch rc
 
-#if defined(USE_TRY)
 	try {
-#else   // !USE_TRY
-	//  Prepare error return
-	if (g->jump_level == MAX_JUMP) {
-		strcpy(g->Message, MSG(TOO_MANY_JUMPS));
-		rc = RC_FX;
-		goto err;
-	} // endif
+		//  This will close the table file(s) and also finalize write
+		//  operations such as Insert, Update, or Delete.
+		tdbp->SetAbort(abort);
+		tdbp->CloseDB(g);
+		tdbp->SetAbort(false);
 
-	if ((rc = setjmp(g->jumper[++g->jump_level])) != 0) {
-		rc = RC_FX;
-		goto err;
-	} // endif
-#endif  // !USE_TRY
+		if (trace > 1)
+			printf("Table %s closed\n", tdbp->GetName());
 
-  //  This will close the table file(s) and also finalize write
-  //  operations such as Insert, Update, or Delete.
-  tdbp->SetAbort(abort);
-  tdbp->CloseDB(g);
-  tdbp->SetAbort(false);
+		if (!nox && tdbp->GetMode() != MODE_READ && tdbp->GetMode() != MODE_ANY) {
+			if (trace > 1)
+				printf("About to reset opt\n");
 
-  if (trace > 1)
-    printf("Table %s closed\n", tdbp->GetName());
+			if (!tdbp->IsRemote()) {
+				// Make all the eventual indexes
+				PTDBDOX tbxp = (PTDBDOX)tdbp;
+				tbxp->ResetKindex(g, NULL);
+				tbxp->SetKey_Col(NULL);
+				rc = tbxp->ResetTableOpt(g, true, tbxp->GetDef()->Indexable() == 1);
+			} // endif remote
 
-	if (!nox && tdbp->GetMode() != MODE_READ && tdbp->GetMode() != MODE_ANY) {
-		if (trace > 1)
-			printf("About to reset opt\n");
-
-		if (!tdbp->IsRemote()) {
-			// Make all the eventual indexes
-			PTDBDOX tbxp = (PTDBDOX)tdbp;
-			tbxp->ResetKindex(g, NULL);
-			tbxp->SetKey_Col(NULL);
-			rc = tbxp->ResetTableOpt(g, true, tbxp->GetDef()->Indexable() == 1);
-		} // endif remote
-
-	} // endif nox
-
-#if defined(USE_TRY)
-} catch (int) {
-	rc = RC_FX;
-} catch (const char *msg) {
-	strcpy(g->Message, msg);
-	rc = RC_FX;
-} // end catch
-#else   // !USE_TRY
-err:
-	g->jump_level--;
-#endif  // !USE_TRY
-
-  if (trace > 1)
-    htrc("Done rc=%d\n", rc);
-
-  return (rc == RC_OK || rc == RC_INFO) ? 0 : rc;
-  } // end of CntCloseTable
+		} // endif nox
+
+	} catch (int) {
+		rc = RC_FX;
+	} catch (const char *msg) {
+		strcpy(g->Message, msg);
+		rc = RC_FX;
+	} // end catch
+
+	if (trace > 1)
+		htrc("Done rc=%d\n", rc);
+
+	return (rc == RC_OK || rc == RC_INFO) ? 0 : rc;
+} // end of CntCloseTable
 
 /***********************************************************************/
 /*  Load and initialize the use of an index.                           */