diff options
| author | unknown <monty@mysql.com> | 2005-01-04 13:23:04 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-04 13:23:04 +0200 |
| commit | 6d0443331ac989415b71adc795c8850a7b19dd98 (patch) | |
| tree | 3d99196c45291a86d16eaf701f69e57d506b42a9 /sql-common | |
| parent | 11f9b67134a4d751c313a66faaf02833b0d63d88 (diff) | |
| parent | 68114c03f7bee53303f58bbc3352ee5b8fad76f8 (diff) | |
| download | mariadb-git-6d0443331ac989415b71adc795c8850a7b19dd98.tar.gz | |
Merge
mysql-test/t/multi_update.test:
Auto merged
sql/sql_table.cc:
Auto merged
support-files/mysql.spec.sh:
SCCS merged
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)) |