diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-04-21 14:57:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-04-21 14:57:10 +0400 |
| commit | 6075c8246771dd14bd52a511ee665b8995e3f33f (patch) | |
| tree | ce58d06c31a735054ce2c8446d5e0c9da5bd97e5 /storage/connect/tabdos.cpp | |
| parent | 187e41697b7e4c43fcfe8e5c01f7cc7ad289f995 (diff) | |
| parent | 7216afbc78f7a4b4d517e04364fcc23255d4dfeb (diff) | |
| download | mariadb-git-6075c8246771dd14bd52a511ee665b8995e3f33f.tar.gz | |
Merge 10.0 -> 10.0-connect
Diffstat (limited to 'storage/connect/tabdos.cpp')
| -rw-r--r-- | storage/connect/tabdos.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/tabdos.cpp b/storage/connect/tabdos.cpp index de97c3a6ea5..86ce92160ab 100644 --- a/storage/connect/tabdos.cpp +++ b/storage/connect/tabdos.cpp @@ -494,7 +494,7 @@ int TDBDOS::MakeIndex(PGLOBAL g, PIXDEF pxdf, bool add) } // endif Type colp->InitValue(g); - n = max(n, xdp->GetNparts()); + n = MY_MAX(n, xdp->GetNparts()); } // endfor kdp keycols = (PCOL*)PlugSubAlloc(g, NULL, n * sizeof(PCOL)); @@ -687,7 +687,7 @@ int TDBDOS::EstimatedLength(PGLOBAL g) // result if we set dep to 1 dep = 1 + cdp->GetLong() / 20; // Why 20 ????? } else for (; cdp; cdp = cdp->GetNext()) - dep = max(dep, cdp->GetOffset()); + dep = MY_MAX(dep, cdp->GetOffset()); return (int)dep; } // end of Estimated Length @@ -1004,7 +1004,7 @@ bool DOSCOL::SetBuffer(PGLOBAL g, PVAL value, bool ok, bool check) // Allocate the buffer used in WriteColumn for numeric columns if (IsTypeNum(Buf_Type)) - Buf = (char*)PlugSubAlloc(g, NULL, max(32, Long + Dcm + 1)); + Buf = (char*)PlugSubAlloc(g, NULL, MY_MAX(32, Long + Dcm + 1)); // Because Colblk's have been made from a copy of the original TDB in // case of Update, we must reset them to point to the original one. @@ -1133,7 +1133,7 @@ void DOSCOL::WriteColumn(PGLOBAL g) memset(tdbp->To_Line + len, ' ', tdbp->Lrecl - len); else // The size actually available must be recalculated - field = min(len - Deplac, Long); + field = MY_MIN(len - Deplac, Long); } // endif Ftype |