Merge 10.0.14 into 10.1

1 files changed, 5 insertions, 2 deletions

diff --git a/storage/connect/tabfix.h b/storage/connect/tabfix.h
index bcd171b37bb..7d5b964da2a 100644
--- a/storage/connect/tabfix.h
+++ b/storage/connect/tabfix.h
@@ -38,7 +38,7 @@ class DllExport TDBFIX : public TDBDOS {
   virtual void ResetDB(void);
   virtual bool IsUsingTemp(PGLOBAL g);
   virtual int  RowNumber(PGLOBAL g, bool b = false);
-  virtual int  ResetTableOpt(PGLOBAL g, bool dox);
+  virtual int  ResetTableOpt(PGLOBAL g, bool dop, bool dox);
   virtual void ResetSize(void);
   virtual int  GetBadLines(void) {return Txfp->GetNerr();}
 
@@ -51,6 +51,8 @@ class DllExport TDBFIX : public TDBDOS {
   virtual int  WriteDB(PGLOBAL g);
 
  protected:
+  virtual bool PrepareWriting(PGLOBAL g) {return false;}
+
   // Members are inherited from TDBDOS
   }; // end of class TDBFIX
 
@@ -89,7 +91,8 @@ class TDBDCL : public TDBCAT {
 
  protected:
 	// Specific routines
-  virtual PQRYRES GetResult(PGLOBAL g) {return DBFColumns(g, Fn, false);}
+  virtual PQRYRES GetResult(PGLOBAL g) 
+      {return DBFColumns(g, ((PTABDEF)To_Def)->GetPath(), Fn, false);}
 
   // Members
   char *Fn;                       // The DBF file (path) name