database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

gcc 8 warnings

Browse Source
This commit is contained in:
Sergei Golubchik
2019-03-29 20:38:53 +01:00
committed by Marko Mäkelä
parent f3adfcb523
commit 79fe17567a
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_alloc.h
View File

@@ -45,9 +45,6 @@ public:
#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 */

4
sql/table.cc
View File

@@ -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)
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
{ {