diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-07 11:30:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-07 11:30:03 +0200 |
| commit | 9e11e055ce1461caecbb30e8300dfdcd48af22f1 (patch) | |
| tree | 48f5dc07a29e44a106c37e7e8e3234c62abbebf6 /sql/item_timefunc.cc | |
| parent | 2b5c9bc2c813ea7963959e515da5d60392c35431 (diff) | |
| parent | 6b99859fff6b8c0a52ea45965834c9c3fdfc4cb3 (diff) | |
| download | mariadb-git-9e11e055ce1461caecbb30e8300dfdcd48af22f1.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 49bf8036ea1..fa74a1903da 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -3100,7 +3100,7 @@ get_date_time_result_type(const char *format, uint length) const char *val= format; const char *end= format + length; - for (; val != end && val != end; val++) + for (; val != end; val++) { if (*val == '%' && val+1 != end) { |