diff --git a/sql/sql_alloc.h b/sql/sql_alloc.h
index 153b0401e29..f475ecdff73 100644
--- a/sql/sql_alloc.h
+++ b/sql/sql_alloc.h
@@ -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 */
diff --git a/sql/table.cc b/sql/table.cc
index e1f6f1a191b..061a23527c2 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -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
   {