diff options
author | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2006-12-26 15:08:41 +0400 |
---|---|---|
committer | ramil/ram@mysql.com/ramil.myoffice.izhnet.ru <> | 2006-12-26 15:08:41 +0400 |
commit | 10475626c1973e6706ce8e5d85e3631587efacd3 (patch) | |
tree | 291b92310a0fa724b2ded79707e9dad6e56adc04 /sql-common | |
parent | 26c0934ee3c66c05c268493484e363d6df02782e (diff) | |
download | mariadb-git-10475626c1973e6706ce8e5d85e3631587efacd3.tar.gz |
Fix for bug #23616: Week() changed behaviour between 5.0.22 and 5.0.24
Consider double values as legal date{time} function's arguments
(i.e. allow dates in internal format YYYYMMDDHHMMSS.XXXXXX).
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 2d3d71e646c..77226da3dc8 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -145,7 +145,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, digits= (uint) (pos-str); start_loop= 0; /* Start of scan loop */ date_len[format_position[0]]= 0; /* Length of year field */ - if (pos == end) + if (pos == end || *pos == '.') { /* Found date in internal format (only numbers like YYYYMMDD) */ year_length= (digits == 4 || digits == 8 || digits >= 14) ? 4 : 2; |