diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-20 10:26:49 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-20 10:41:32 +0200 |
| commit | 514b305dfb2839c619a623bbdae5f21cf0077672 (patch) | |
| tree | 2f9700f05ccf0ddc7e46a547d9a191404e8dbbd7 /sql/sql_select.h | |
| parent | de51acd03730311505677eb7212756e7126183b3 (diff) | |
| parent | 117291db8b35ddb4cd8c89ee4d8de888160b7163 (diff) | |
| download | mariadb-git-514b305dfb2839c619a623bbdae5f21cf0077672.tar.gz | |
Merge 10.3 into 10.4
The MDEV-17262 commit 26432e49d37a37d09b862bb49a021e44bdf4789c
was skipped. In Galera 4, the implementation would seem to require
changes to the streaming replication.
In the tests archive.rnd_pos main.profiling, disable_ps_protocol
for SHOW STATUS and SHOW PROFILE commands until MDEV-18974
has been fixed.
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index dcf95f04702..55ab94186ad 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -246,7 +246,6 @@ struct SplM_plan_info; class SplM_opt_info; typedef struct st_join_table { - st_join_table() {} TABLE *table; TABLE_LIST *tab_list; KEYUSE *keyuse; /**< pointer to first used key */ @@ -2157,9 +2156,9 @@ public: static void operator delete(void *ptr, size_t size) { TRASH_FREE(ptr, size); } static void operator delete(void *, THD *) throw(){} - 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; copy_blobs= true; |