Commit e06f8fbb authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

merge

parents 8250cece 7cd29fe9
...@@ -2758,7 +2758,7 @@ void Item_param::set_time(MYSQL_TIME *tm, timestamp_type time_type, ...@@ -2758,7 +2758,7 @@ void Item_param::set_time(MYSQL_TIME *tm, timestamp_type time_type,
value.time.minute > 59 || value.time.second > 59 || value.time.minute > 59 || value.time.second > 59 ||
value.time.second_part > MAX_SEC_PART_VALUE) value.time.second_part > MAX_SEC_PART_VALUE)
{ {
Lazy_string_time str(tm); Lazy_string_time str(&value.time);
make_truncated_value_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, make_truncated_value_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
&str, time_type, 0); &str, time_type, 0);
set_zero_time(&value.time, MYSQL_TIMESTAMP_ERROR); set_zero_time(&value.time, MYSQL_TIMESTAMP_ERROR);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment