diff --git a/storage/connect/mysql-test/connect/r/pivot.result b/storage/connect/mysql-test/connect/r/pivot.result
index 4455d333e5a..4480788332b 100644
--- a/storage/connect/mysql-test/connect/r/pivot.result
+++ b/storage/connect/mysql-test/connect/r/pivot.result
@@ -6,7 +6,7 @@ Who  CHAR(10) NOT NULL,
 Week INT(2) NOT NULL,
 What CHAR(12) NOT NULL,
 Amount DOUBLE(8,2))
-ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='expenses.txt';
+ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='expenses.txt' ENDING=2;
 SELECT * FROM expenses;
 Who	Week	What	Amount
 Joe	3	Beer	18.00
diff --git a/storage/connect/mysql-test/connect/t/pivot.test b/storage/connect/mysql-test/connect/t/pivot.test
index 75a208e853b..f06c92828f9 100644
--- a/storage/connect/mysql-test/connect/t/pivot.test
+++ b/storage/connect/mysql-test/connect/t/pivot.test
@@ -10,7 +10,7 @@ Who  CHAR(10) NOT NULL,
 Week INT(2) NOT NULL,
 What CHAR(12) NOT NULL,
 Amount DOUBLE(8,2))
-ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='expenses.txt';
+ENGINE=CONNECT TABLE_TYPE=FIX FILE_NAME='expenses.txt' ENDING=2;
 SELECT * FROM expenses;
 
 --echo #
diff --git a/storage/connect/tabpivot.cpp b/storage/connect/tabpivot.cpp
index 429bb88e0fc..efd9cf6a950 100644
--- a/storage/connect/tabpivot.cpp
+++ b/storage/connect/tabpivot.cpp
@@ -876,7 +876,7 @@ int TDBPIVOT::DeleteDB(PGLOBAL g, int irc)
 /***********************************************************************/
 void TDBPIVOT::CloseDB(PGLOBAL g)
   {
-//Tdbp->CloseDB(g);
+  Tdbp->CloseDB(g);
   } // end of CloseDB
 
 #if 0
@@ -1242,8 +1242,8 @@ QRSCOL::QRSCOL(PGLOBAL g, PCOLRES crp, PTDB tdbp, PCOL cprec, int i)
   Long = Crp->Clen;
   Buf_Type = crp->Type;
   strcpy(Format.Type, GetFormatType(Buf_Type));
-  Format.Length = (SHORT)Long;
-  Format.Prec = (SHORT)Crp->Prec;
+  Format.Length = (short)Long;
+  Format.Prec = (short)Crp->Prec;
 
   if (trace) {
     htrc("Making new QRSCOL C%d %s at %p\n", Index, Name, this);
@@ -1284,7 +1284,7 @@ void QRSCOL::ReadColumn(PGLOBAL g)
 /***********************************************************************/
 /*  Make file output of a Dos column descriptor block.                 */
 /***********************************************************************/
-void QRSCOL::Print(PGLOBAL g, FILE *f, UINT n)
+void QRSCOL::Print(PGLOBAL g, FILE *f, uint n)
   {
   COLBLK::Print(g, f, n);
 
diff --git a/storage/connect/tabpivot.h b/storage/connect/tabpivot.h
index 3aa5288b5d8..bed288dc560 100644
--- a/storage/connect/tabpivot.h
+++ b/storage/connect/tabpivot.h
@@ -231,7 +231,7 @@ class DllExport QRSCOL : public COLBLK {
 
   // Methods
   virtual void    ReadColumn(PGLOBAL g);
-  virtual void    Print(PGLOBAL g, FILE *, UINT);
+  virtual void    Print(PGLOBAL g, FILE *, uint);
 
  protected:
   QRSCOL(void) {}    // Default constructor not to be used