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/taboccur.cpp | |
| parent | 187e41697b7e4c43fcfe8e5c01f7cc7ad289f995 (diff) | |
| parent | 7216afbc78f7a4b4d517e04364fcc23255d4dfeb (diff) | |
| download | mariadb-git-6075c8246771dd14bd52a511ee665b8995e3f33f.tar.gz | |
Merge 10.0 -> 10.0-connect
Diffstat (limited to 'storage/connect/taboccur.cpp')
| -rw-r--r-- | storage/connect/taboccur.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/taboccur.cpp b/storage/connect/taboccur.cpp index 96901424a7d..917685faae3 100644 --- a/storage/connect/taboccur.cpp +++ b/storage/connect/taboccur.cpp @@ -106,7 +106,7 @@ bool OcrColumns(PGLOBAL g, PQRYRES qrp, const char *col, } // endif m for (k = 0, pn = colist; k < m; k++, pn += (strlen(pn) + 1)) - n = max(n, (signed)strlen(pn)); + n = MY_MAX(n, (signed)strlen(pn)); } // endif k @@ -199,7 +199,7 @@ bool OcrSrcCols(PGLOBAL g, PQRYRES qrp, const char *col, if ((rk = (rank && *rank))) for (k = 0, pn = colist; k < m; k++, pn += (strlen(pn) + 1)) - n = max(n, (signed)strlen(pn)); + n = MY_MAX(n, (signed)strlen(pn)); // Default occur column name is the 1st colist column name if (!ocr || !*ocr) |