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 /sql-common/my_time.c | |
| parent | 35bc8f9f4353b64da215e52ff6f1612a8ce66f43 (diff) | |
| download | mariadb-git-068c61978e3a81836d52b8caf11e044290159ad1.tar.gz | |
Temporary commit of 10.0-merge
Diffstat (limited to 'sql-common/my_time.c')
| -rw-r--r-- | sql-common/my_time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index fbcf52dbf19..640d52dab16 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -126,7 +126,7 @@ static int get_number(uint *val, uint *number_of_fields, const char **str, static int get_digits(uint *val, uint *number_of_fields, const char **str, const char *end, uint length) { - return get_number(val, number_of_fields, str, min(end, *str + length)); + return get_number(val, number_of_fields, str, MY_MIN(end, *str + length)); } static int get_punct(const char **str, const char *end) |