diff options
| author | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-05 12:04:37 +0400 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/ramil.myoffice.izhnet.ru> | 2007-03-05 12:04:37 +0400 |
| commit | a6c2de6067fd27b479a284c1b5fecfbd527155aa (patch) | |
| tree | d2584464ee7467773e52bba65f5ae4063f6a9daa /sql-common | |
| parent | 81c3505967461a0848fb3c06a12b3bf1371a4f2f (diff) | |
| parent | 7fc2a2a765f976bd0ee7a5c965d33b429aba1a52 (diff) | |
| download | mariadb-git-a6c2de6067fd27b479a284c1b5fecfbd527155aa.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/ram/work/b23616/b23616.5.0
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')
| -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 446ae59f452..83b647be1bd 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; |