diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:18:25 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-13 18:18:25 +0300 |
commit | 4bd56a697ff2d2edc230a82dbfcf4412ef0996df (patch) | |
tree | 77a6e74518875d83ecaf6447b5f5b8801ef50b2f /sql/sql_time.cc | |
parent | 863e28ff3ed0a5859561c397cbfb492170989ddd (diff) | |
parent | 3e617b8bef50a81b10b8152d800a1b8b38859913 (diff) | |
download | mariadb-git-4bd56a697ff2d2edc230a82dbfcf4412ef0996df.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_time.cc')
-rw-r--r-- | sql/sql_time.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_time.cc b/sql/sql_time.cc index a629e006c04..cb09daff6f5 100644 --- a/sql/sql_time.cc +++ b/sql/sql_time.cc @@ -432,7 +432,7 @@ static bool number_to_time_with_warn(bool neg, ulonglong nr, ulong sec_part, int was_cut; longlong res; enum_mysql_timestamp_type ts_type; - bool have_warnings; + bool have_warnings= false; if (fuzzydate & TIME_TIME_ONLY) { |