diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-22 10:27:11 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-11-22 10:27:11 +0400 |
| commit | ca0658d4712f0d3a528224b45b893413af7831c5 (patch) | |
| tree | 8cb6416b1a17ef8773d2d50520fd9a765609fc41 /sql/item_timefunc.cc | |
| parent | bd82fb526aaf8afd3d47822c3ad37b49f8e3da68 (diff) | |
| parent | 8473844792f5b206d9828bb1e195a2188ea4e63e (diff) | |
| download | mariadb-git-ca0658d4712f0d3a528224b45b893413af7831c5.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/bug22029/my50-bug22029
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 0bba00cbeec..d79dd2a4b44 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -290,15 +290,16 @@ 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 (*ptr == '%' && ptr+1 != end) { int val_len; char *tmp; error= 0; - /* Skip pre-space between each argument */ - while (val != val_end && my_isspace(cs, *val)) - val++; val_len= (uint) (val_end - val); switch (*++ptr) { |