diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-03-28 12:03:53 +0400 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2011-03-28 12:03:53 +0400 |
| commit | 315ce7bf4fb0fc1834476d89fd999c6315df0864 (patch) | |
| tree | 2f1fec80b8ea0c0e3d2211a995c5b85c7121a190 /sql | |
| parent | ca5fa25bc105902c4b8e930e70245f184cd05f5d (diff) | |
| parent | e9935c6363b9fb1f132c4ca43dd38fddd61ebc10 (diff) | |
| download | mariadb-git-315ce7bf4fb0fc1834476d89fd999c6315df0864.tar.gz | |
5.1->5.5 merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 99467b7c3fc..c277e538999 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -315,8 +315,8 @@ static bool extract_date_time(DATE_TIME_FORMAT *format, for (; ptr != end && val != val_end; ptr++) { /* Skip pre-space between each argument */ - while (val != val_end && my_isspace(cs, *val)) - val++; + if ((val+= cs->cset->scan(cs, val, val_end, MY_SEQ_SPACES)) >= val_end) + break; if (*ptr == '%' && ptr+1 != end) { |