diff options
| author | monty@mysql.com <> | 2005-01-03 23:04:52 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-01-03 23:04:52 +0200 |
| commit | 309b1a2b6ca36ed76753057cb032b6f4179bdc9b (patch) | |
| tree | 0f73878fcf058ff862f3f7eb305aafae2ad3465d /sql-common | |
| parent | a9853184d3b69a3802984e0994282dc3a3320296 (diff) | |
| parent | 530a104eec3abc0620ee6c3b649f9a425306bfe1 (diff) | |
| download | mariadb-git-309b1a2b6ca36ed76753057cb032b6f4179bdc9b.tar.gz | |
Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 45adb657f73..c67ce1d3f85 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -382,8 +382,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, } l_time->neg= 0; - if (year_length == 2 && i >= format_position[1] && i >=format_position[2] && - (l_time->month || l_time->day)) + if (year_length == 2 && not_zero_date) l_time->year+= (l_time->year < YY_PART_YEAR ? 2000 : 1900); if (!not_zero_date && (flags & TIME_NO_ZERO_DATE)) |