diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-21 15:23:45 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-21 15:23:45 +0300 |
| commit | 32ec5fb979760ba2db52d8afc39e8e090cf80a9c (patch) | |
| tree | 354038721b2f99c9834c31c4a6f3a5fa23c21341 /sql-common | |
| parent | e8de75db88acdf228237fbebad7f4c8f05e5cc1f (diff) | |
| parent | 9de2e60d7491fcf3cd1f20a4be715ef0bedc316f (diff) | |
| download | mariadb-git-32ec5fb979760ba2db52d8afc39e8e090cf80a9c.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql-common')
| -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 36b6c368f56..3a1f176485f 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -185,7 +185,7 @@ static int get_date_time_separator(uint *number_of_fields, ulonglong flags, do { s++; - } while (my_isspace(&my_charset_latin1, *s)); + } while (s < end && my_isspace(&my_charset_latin1, *s)); *str= s; return 0; } |