diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-08-08 10:54:47 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-08-08 10:54:47 +0200 |
| commit | 0eacebf167daeeabcc3c60f0675db2aa75b7e033 (patch) | |
| tree | d1c4cf8181c4c6caa80a0ebced1222c4ae562048 /storage | |
| parent | 8ab46a5129ad1021fe8f5601a4a6cebc39e9e770 (diff) | |
| parent | 5f533035d3ad8dc56ef339196633a931d7bff60c (diff) | |
| download | mariadb-git-0eacebf167daeeabcc3c60f0675db2aa75b7e033.tar.gz | |
Merge branch 'ob-10.0' into 10.0
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/reldef.h | 3 | ||||
| -rw-r--r-- | storage/connect/tabdos.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/storage/connect/reldef.h b/storage/connect/reldef.h index 4aa29037dfc..dada5716dbe 100644 --- a/storage/connect/reldef.h +++ b/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 diff --git a/storage/connect/tabdos.cpp b/storage/connect/tabdos.cpp index a1e58ab3344..527fe55dd89 100644 --- a/storage/connect/tabdos.cpp +++ b/storage/connect/tabdos.cpp @@ -2018,7 +2018,8 @@ int TDBDOS::EstimatedLength(void) // result if we set dep to 1 dep = 1 + cdp->GetLong() / 20; // Why 20 ????? } else for (; cdp; cdp = cdp->GetNext()) - dep = MY_MAX(dep, cdp->GetOffset()); + if (!(cdp->Flags & (U_VIRTUAL|U_SPECIAL))) + dep = MY_MAX(dep, cdp->GetOffset()); return (int)dep; } // end of Estimated Length |