diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-16 16:03:54 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-17 13:06:56 +0100 |
| commit | f38c3521725ff9847819eb92af46cbb302650770 (patch) | |
| tree | ceb9c76ca50e1b098a70c764d75523e1312bc826 /sql | |
| parent | b64fde8f38515dc39e019de26db7624cc0ea7046 (diff) | |
| download | mariadb-git-f38c3521725ff9847819eb92af46cbb302650770.tar.gz | |
post-merge: gcc 8 warnings
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/datadict.cc | 2 | ||||
| -rw-r--r-- | sql/ha_partition.cc | 2 | ||||
| -rw-r--r-- | sql/handler.cc | 1 | ||||
| -rw-r--r-- | sql/mysqld.h | 3 | ||||
| -rw-r--r-- | sql/sql_partition_admin.cc | 4 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 |
6 files changed, 5 insertions, 9 deletions
diff --git a/sql/datadict.cc b/sql/datadict.cc index 410dbff8778..231e7ea22ca 100644 --- a/sql/datadict.cc +++ b/sql/datadict.cc @@ -196,7 +196,7 @@ bool dd_recreate_table(THD *thd, const char *db, const char *table_name, char path_buf[FN_REFLEN + 1]; DBUG_ENTER("dd_recreate_table"); - memset(&create_info, 0, sizeof(create_info)); + create_info.init(); if (path) create_info.options|= HA_LEX_CREATE_TMP_TABLE; diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 051a0e15af9..98a3259a39b 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -2194,7 +2194,7 @@ void ha_partition::update_create_info(HA_CREATE_INFO *create_info) uint num_parts= (num_subparts ? m_file_tot_parts / num_subparts : m_file_tot_parts); HA_CREATE_INFO dummy_info; - memset(&dummy_info, 0, sizeof(dummy_info)); + dummy_info.init(); /* Since update_create_info() can be called from mysql_prepare_alter_table() diff --git a/sql/handler.cc b/sql/handler.cc index 53c58e64782..e01392d236c 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6976,7 +6976,6 @@ static Create_field *vers_init_sys_field(THD *thd, const char *field_name, int f if (!f) return NULL; - memset(f, 0, sizeof(*f)); f->field_name.str= field_name; f->field_name.length= strlen(field_name); f->charset= system_charset_info; diff --git a/sql/mysqld.h b/sql/mysqld.h index d5cabd790b2..9cb0a0fda39 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -196,9 +196,6 @@ struct vers_asof_timestamp_t { ulong type; MYSQL_TIME ltime; - vers_asof_timestamp_t() : - type(SYSTEM_TIME_UNSPECIFIED) - {} }; enum vers_alter_history_enum diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc index cba4949ccd3..a530f2886b4 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -192,8 +192,8 @@ static bool compare_table_with_partition(THD *thd, TABLE *table, DBUG_ENTER("compare_table_with_partition"); bool metadata_equal= false; - memset(&part_create_info, 0, sizeof(HA_CREATE_INFO)); - memset(&table_create_info, 0, sizeof(HA_CREATE_INFO)); + part_create_info.init(); + table_create_info.init(); update_create_info_from_table(&table_create_info, table); /* get the current auto_increment value */ diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 0003d546ed3..e5dbfeed149 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -5518,7 +5518,7 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables, if (file) { HA_CREATE_INFO create_info; - memset(&create_info, 0, sizeof(create_info)); + create_info.init(); file->update_create_info(&create_info); append_directory(thd, &str, "DATA", create_info.data_file_name); append_directory(thd, &str, "INDEX", create_info.index_file_name); |