Commit 79fe1756 authored by Sergei Golubchik's avatar Sergei Golubchik Committed by Marko Mäkelä

gcc 8 warnings

parent f3adfcb5
...@@ -45,9 +45,6 @@ class Sql_alloc ...@@ -45,9 +45,6 @@ class Sql_alloc
#ifdef HAVE_valgrind #ifdef HAVE_valgrind
bool dummy_for_valgrind; bool dummy_for_valgrind;
inline Sql_alloc() :dummy_for_valgrind(0) {} inline Sql_alloc() :dummy_for_valgrind(0) {}
#else
inline Sql_alloc() {}
#endif #endif
inline ~Sql_alloc() {}
}; };
#endif /* SQL_ALLOC_INCLUDED */ #endif /* SQL_ALLOC_INCLUDED */
...@@ -59,6 +59,8 @@ struct extra2_fields ...@@ -59,6 +59,8 @@ struct extra2_fields
LEX_CUSTRING field_flags; LEX_CUSTRING field_flags;
LEX_CUSTRING system_period; LEX_CUSTRING system_period;
LEX_CUSTRING application_period; LEX_CUSTRING application_period;
void reset()
{ bzero((void*)this, sizeof(*this)); }
}; };
static Virtual_column_info * unpack_vcol_info_from_frm(THD *, MEM_ROOT *, static Virtual_column_info * unpack_vcol_info_from_frm(THD *, MEM_ROOT *,
...@@ -1451,7 +1453,7 @@ bool read_extra2(const uchar *frm_image, size_t len, extra2_fields *fields) ...@@ -1451,7 +1453,7 @@ bool read_extra2(const uchar *frm_image, size_t len, extra2_fields *fields)
DBUG_ENTER("read_extra2"); DBUG_ENTER("read_extra2");
memset(fields, 0, sizeof(extra2_fields)); fields->reset();
if (*extra2 != '/') // old frm had '/' there if (*extra2 != '/') // old frm had '/' there
{ {
......
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