diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-03-17 14:13:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-03-17 14:13:03 +0100 |
| commit | 1cda2654578b82da52c29a829d463955f8795cc9 (patch) | |
| tree | f3a8de34f4bf0c331723a999dedc78e87be4b9bb /sql-common | |
| parent | a169ede155937cba04b01ea104d7904d89f87007 (diff) | |
| download | mariadb-git-1cda2654578b82da52c29a829d463955f8795cc9.tar.gz | |
* fix for ALTER TABLE ... MODIFY timestamp->timestamp.
Use dedicated do_field_temporal() for Copy_field.
* check_time_range() needs to know TIME's precision to use the
correct max value.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 11dd60646ef..f05f1fe835b 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -654,7 +654,7 @@ fractional: l_time->time_type= MYSQL_TIMESTAMP_TIME; /* Check if the value is valid and fits into MYSQL_TIME range */ - if (check_time_range(l_time, warning)) + if (check_time_range(l_time, 6, warning)) return MYSQL_TIMESTAMP_ERROR; /* Check if there is garbage at end of the MYSQL_TIME specification */ @@ -679,6 +679,7 @@ fractional: SYNOPSIS: check_time_range() time pointer to MYSQL_TIME value + uint dec warning set MYSQL_TIME_WARN_OUT_OF_RANGE flag if the value is out of range DESCRIPTION @@ -691,17 +692,24 @@ fractional: 1 time value is invalid */ -int check_time_range(struct st_mysql_time *my_time, int *warning) +int check_time_range(struct st_mysql_time *my_time, uint dec, int *warning) { longlong hour; + static ulong max_sec_part[MAX_SEC_PART_DIGITS+1]= {000000, 900000, 990000, + 999000, 999900, 999990, 999999}; if (my_time->minute >= 60 || my_time->second >= 60) return 1; hour= my_time->hour + (24*my_time->day); + + if (dec == AUTO_SEC_PART_DIGITS) + dec= MAX_SEC_PART_DIGITS; + if (hour <= TIME_MAX_HOUR && (hour != TIME_MAX_HOUR || my_time->minute != TIME_MAX_MINUTE || - my_time->second != TIME_MAX_SECOND || !my_time->second_part)) + my_time->second != TIME_MAX_SECOND || + my_time->second_part <= max_sec_part[dec])) return 0; my_time->day= 0; |