database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2019-03-17 13:06:41 +01:00
parent a89ee3cd15 1f020299f8
commit b64fde8f38
147 changed files with 1449 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_select.h
View File

@ -241,7 +241,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 */
@ -2134,9 +2133,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;