post-merge fix

d5c17681 · serg@serg.mylan · 2d3dd65c · d5c17681
Commit d5c17681 authored Nov 20, 2004 by serg@serg.mylan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item.cc sql/item.cc +1 -1

No files found.
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -1036,7 +1036,7 @@ void Item_param::set_time(TIME *tm, timestamp_type type, uint32 max_length_arg)
  {
    char buff[MAX_DATE_STRING_REP_LENGTH];
    uint length= my_TIME_to_str(&value.time, buff);
-    make_truncated_value_warning(current_thd, buff, length, type);
+    make_truncated_value_warning(current_thd, buff, length, type, 0);
    set_zero_time(&value.time, MYSQL_TIMESTAMP_ERROR);
  }