summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2018-02-16 13:44:24 +0400
committerAlexander Barkov <bar@mariadb.org>2018-02-16 13:44:24 +0400
commit6668da22167fbefdd8ae462a64eb986a6e9f1e08 (patch)
tree072a43d39fb85c0f03fa2ab026eae9a2d6e2e330 /sql/item.cc
parent5ab46028103ca91451ea2449e238c37168e54ad0 (diff)
downloadmariadb-git-6668da22167fbefdd8ae462a64eb986a6e9f1e08.tar.gz
MDEV-15289 Binding an out-of-range DATETIME value in binary protocol breaks replication
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 03949c1ceef..67cf5b3da21 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -3562,7 +3562,7 @@ void Item_param::set_time(MYSQL_TIME *tm, timestamp_type time_type,
ErrConvTime str(&value.time);
make_truncated_value_warning(current_thd, Sql_condition::WARN_LEVEL_WARN,
&str, time_type, 0);
- set_zero_time(&value.time, MYSQL_TIMESTAMP_ERROR);
+ set_zero_time(&value.time, time_type);
}
maybe_null= 0;
null_value= 0;