mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
gcc 8 warnings
This commit is contained in:
committed by
Marko Mäkelä
parent
f3adfcb523
commit
79fe17567a
@@ -45,9 +45,6 @@ public:
|
||||
#ifdef HAVE_valgrind
|
||||
bool dummy_for_valgrind;
|
||||
inline Sql_alloc() :dummy_for_valgrind(0) {}
|
||||
#else
|
||||
inline Sql_alloc() {}
|
||||
#endif
|
||||
inline ~Sql_alloc() {}
|
||||
};
|
||||
#endif /* SQL_ALLOC_INCLUDED */
|
||||
|
@@ -59,6 +59,8 @@ struct extra2_fields
|
||||
LEX_CUSTRING field_flags;
|
||||
LEX_CUSTRING system_period;
|
||||
LEX_CUSTRING application_period;
|
||||
void reset()
|
||||
{ bzero((void*)this, sizeof(*this)); }
|
||||
};
|
||||
|
||||
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)
|
||||
|
||||
DBUG_ENTER("read_extra2");
|
||||
|
||||
memset(fields, 0, sizeof(extra2_fields));
|
||||
fields->reset();
|
||||
|
||||
if (*extra2 != '/') // old frm had '/' there
|
||||
{
|
||||
|
Reference in New Issue
Block a user