Merge branch 'ob-10.0' into 10.0

storage/connect/reldef.h

@@ -193,7 +193,8 @@ class DllExport COLDEF : public COLCRT { /* Column description block
   friend class COLBLK;
   friend class DBFFAM;
   friend class TDBASE;
- public:
+	friend class TDBDOS;
+public:
   COLDEF(void);                // Constructor
 
   // Implementation

storage/connect/tabdos.cpp

@@ -2018,6 +2018,7 @@ int TDBDOS::EstimatedLength(void)
     // result if we set dep to 1
     dep = 1 + cdp->GetLong() / 20;           // Why 20 ?????
   } else for (; cdp; cdp = cdp->GetNext())
+		if (!(cdp->Flags & (U_VIRTUAL|U_SPECIAL)))
 			dep = MY_MAX(dep, cdp->GetOffset());
 
   return (int)dep;