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/csort.cpp | |
| parent | 187e41697b7e4c43fcfe8e5c01f7cc7ad289f995 (diff) | |
| parent | 7216afbc78f7a4b4d517e04364fcc23255d4dfeb (diff) | |
| download | mariadb-git-6075c8246771dd14bd52a511ee665b8995e3f33f.tar.gz | |
Merge 10.0 -> 10.0-connect
Diffstat (limited to 'storage/connect/csort.cpp')
| -rw-r--r-- | storage/connect/csort.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/csort.cpp b/storage/connect/csort.cpp index 4a49666c914..2f918782c80 100644 --- a/storage/connect/csort.cpp +++ b/storage/connect/csort.cpp @@ -295,7 +295,7 @@ int CSORT::Qsortx(void) /*****************************************************************/ /* Call conservative insertion sort not using/setting offset. */ /*****************************************************************/ - Istc(Pex, Pex + min(Nitem, Thresh), top); + Istc(Pex, Pex + MY_MIN(Nitem, Thresh), top); } // endif Thresh @@ -669,7 +669,7 @@ int CSORT::Qsortc(void) /*****************************************************************/ /* Call conservative insertion sort not using/setting offset. */ /*****************************************************************/ - Istc(Pex, Pex + min(Nitem, Thresh), max); + Istc(Pex, Pex + MY_MIN(Nitem, Thresh), max); } // endif Thresh |