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/filamfix.cpp | |
| parent | 187e41697b7e4c43fcfe8e5c01f7cc7ad289f995 (diff) | |
| parent | 7216afbc78f7a4b4d517e04364fcc23255d4dfeb (diff) | |
| download | mariadb-git-6075c8246771dd14bd52a511ee665b8995e3f33f.tar.gz | |
Merge 10.0 -> 10.0-connect
Diffstat (limited to 'storage/connect/filamfix.cpp')
| -rw-r--r-- | storage/connect/filamfix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/filamfix.cpp b/storage/connect/filamfix.cpp index f4455f3ce5b..a64d7bdc04d 100644 --- a/storage/connect/filamfix.cpp +++ b/storage/connect/filamfix.cpp @@ -476,7 +476,7 @@ bool FIXFAM::MoveIntermediateLines(PGLOBAL g, bool *b) return true; } // endif - req = (size_t)min(n, Dbflen); + req = (size_t)MY_MIN(n, Dbflen); len = fread(DelBuf, Lrecl, req, Stream); if (trace > 1) @@ -1322,7 +1322,7 @@ bool BGXFAM::MoveIntermediateLines(PGLOBAL g, bool *b) if (BigSeek(g, Hfile, (BIGINT)Spos * (BIGINT)Lrecl)) return true; - req = min(n, Dbflen) * Lrecl; + req = MY_MIN(n, Dbflen) * Lrecl; if ((nbr = BigRead(g, Hfile, DelBuf, req)) != req) { sprintf(g->Message, MSG(DEL_READ_ERROR), req, nbr); |