diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 15:03:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-15 21:00:50 +0100 |
| commit | f1134d567695990dc7d62b6c25e4b9aa8de439e0 (patch) | |
| tree | 10b60521eb410aeb5139b89248d76acf4dff86cc /sql/sql_select.cc | |
| parent | 0508d327aef520d3131ff8a85ed610337149fffc (diff) | |
| download | mariadb-git-f1134d567695990dc7d62b6c25e4b9aa8de439e0.tar.gz | |
post-merge: gcc 8 warnings
note: Inherit String from Sql_alloc,
to get operators new and new[] in sync
in rocksdb gcc was complaining that non-lvalue was cast to const.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 69aa8a97a87..1dfd6520e17 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2447,7 +2447,7 @@ bool JOIN::make_aggr_tables_info() aggr_tables++; curr_tab= join_tab + exec_join_tab_cnt(); - bzero(curr_tab, sizeof(JOIN_TAB)); + bzero((void*)curr_tab, sizeof(JOIN_TAB)); curr_tab->ref.key= -1; curr_tab->join= this; @@ -2535,7 +2535,7 @@ bool JOIN::make_aggr_tables_info() { aggr_tables++; curr_tab= join_tab + exec_join_tab_cnt(); - bzero(curr_tab, sizeof(JOIN_TAB)); + bzero((void*)curr_tab, sizeof(JOIN_TAB)); curr_tab->ref.key= -1; if (only_const_tables()) first_select= sub_select_postjoin_aggr; @@ -2663,7 +2663,7 @@ bool JOIN::make_aggr_tables_info() curr_tab++; aggr_tables++; - bzero(curr_tab, sizeof(JOIN_TAB)); + bzero((void*)curr_tab, sizeof(JOIN_TAB)); curr_tab->ref.key= -1; /* group data to new table */ @@ -17448,7 +17448,7 @@ bool Virtual_tmp_table::init(uint field_count) &bitmaps, bitmap_buffer_size(field_count) * 6, NullS)) return true; - bzero(s, sizeof(*s)); + s->reset(); s->blob_field= blob_field; setup_tmp_table_column_bitmaps(this, bitmaps, field_count); m_alloced_field_count= field_count; |