diff options
| author | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-03-05 11:57:51 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@ramil.myoffice.izhnet.ru> | 2007-03-05 11:57:51 +0400 |
| commit | bee7ddbc88760ec1e4f1a46ddb11ea5d0194c72b (patch) | |
| tree | 6ebf60bef053d8a437dc8caadeaf57f2169c6bec /sql-common/my_time.c | |
| parent | 44bfc3e99ea7c4cfc1909cfb8a538e8a4a21fbcd (diff) | |
| parent | e5d9a306dc23bca14f6f2c83de0eacc1b1ad0c71 (diff) | |
| download | mariadb-git-bee7ddbc88760ec1e4f1a46ddb11ea5d0194c72b.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/ram/work/b23616/b23616.5.1
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql-common/my_time.c:
Auto merged
Diffstat (limited to 'sql-common/my_time.c')
| -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; |