diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-08-07 17:21:37 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-08-07 17:21:37 +0400 |
| commit | a3d79f2e58562c7b50d50827a0149234c225ea43 (patch) | |
| tree | c266edef9eaf41a612e77972163d3d8eb0d280ba /sql-common/my_time.c | |
| parent | 8e36dde7e1f149d8973fe14d8288e678d1ba9b61 (diff) | |
| parent | a765e035a0c40ee04df42fba5c02484e83d31483 (diff) | |
| download | mariadb-git-a3d79f2e58562c7b50d50827a0149234c225ea43.tar.gz | |
Merge 10.0-serg -> 10.0
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 109bea7b4dd..75b94d14ac4 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -127,7 +127,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) |