Commit 30b007a1 authored by Alexander Barkov's avatar Alexander Barkov

Fixing a valgrind warning introduced in the previous changeset:

"have_warnings" was set to an uninialized value when converting
a negative number to datetime.
parent 661daf16
...@@ -303,8 +303,15 @@ static bool number_to_time_with_warn(bool neg, ulonglong nr, ulong sec_part, ...@@ -303,8 +303,15 @@ static bool number_to_time_with_warn(bool neg, ulonglong nr, ulong sec_part,
else else
{ {
f_type= MYSQL_TYPE_DATETIME; f_type= MYSQL_TYPE_DATETIME;
res= neg ? -1 : number_to_datetime(nr, sec_part, ltime, fuzzydate, &was_cut); if (neg)
have_warnings= was_cut && (fuzzydate & TIME_NO_ZERO_IN_DATE); {
res= -1;
}
else
{
res= number_to_datetime(nr, sec_part, ltime, fuzzydate, &was_cut);
have_warnings= was_cut && (fuzzydate & TIME_NO_ZERO_IN_DATE);
}
} }
if (res < 0 || have_warnings) if (res < 0 || have_warnings)
......
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