diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-03-26 00:03:13 +0200 |
| commit | 068c61978e3a81836d52b8caf11e044290159ad1 (patch) | |
| tree | 2cbca861ab2cebe3bd99379ca9668bb483ca0d2a /strings/ctype-uca.c | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'strings/ctype-uca.c')
| -rw-r--r-- | strings/ctype-uca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index e4a8d7a4067..5feeb661d2a 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -7726,7 +7726,7 @@ static void my_coll_lexem_print_error(MY_COLL_LEXEM *lexem, { char tail[30]; size_t len= lexem->end - lexem->prev; - strmake (tail, lexem->prev, (size_t) min(len, sizeof(tail)-1)); + strmake (tail, lexem->prev, (size_t) MY_MIN(len, sizeof(tail)-1)); errstr[errsize-1]= '\0'; my_snprintf(errstr,errsize-1,"%s at '%s'", txt, tail); } |