diff options
| author | ramil/ram@ramil.myoffice.izhnet.ru <> | 2007-03-05 11:57:51 +0400 |
|---|---|---|
| committer | ramil/ram@ramil.myoffice.izhnet.ru <> | 2007-03-05 11:57:51 +0400 |
| commit | b69493027e0f37714785e6fe85bbd55b15f98e65 (patch) | |
| tree | 6ebf60bef053d8a437dc8caadeaf57f2169c6bec /sql-common | |
| parent | edf3519b231fc3012edf31e681a911c813deefe6 (diff) | |
| parent | 363b0b6ff193f1995a027f5fa5e864bfc66096c9 (diff) | |
| download | mariadb-git-b69493027e0f37714785e6fe85bbd55b15f98e65.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/ram/work/b23616/b23616.5.1
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 a26e38b2123..e62003d13ed 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -206,7 +206,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; |