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.h | |
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.h')
-rw-r--r-- | sql/sql_select.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 09e8f5a3e10..5eea5937ea6 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -2046,9 +2046,9 @@ public: static void *operator new(size_t size, THD *thd) throw(); static void operator delete(void *ptr, size_t size) {TRASH_FREE(ptr, size);} - Virtual_tmp_table(THD *thd) + Virtual_tmp_table(THD *thd) : m_alloced_field_count(0) { - bzero(this, sizeof(*this)); + reset(); temp_pool_slot= MY_BIT_NONE; in_use= thd; } |