database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

FE connection info structure migration.

Browse Source 
Replaced INFINIDB_VTABLE.cal_conn_info with a plugin thread variable.
	Fixed query_string memory deallocation crash at plugin_thdvar_cleanup.
This commit is contained in:
Roman Nozdrin
2018-12-30 07:38:39 +03:00
parent 971055a473
commit ca0240037a
10 changed files with 303 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dbcon/mysql/ha_pseudocolumn.cpp
View File

@ -20,6 +20,7 @@ using namespace execplan;
#include "functor_str.h"
#include "ha_calpont_impl_if.h"
#include "mcs_sysvars.h"
using namespace cal_impl_if;
namespace
@ -54,10 +55,10 @@ int64_t idblocalpm()
{
THD* thd = current_thd;
if (!thd->infinidb_vtable.cal_conn_info)
thd->infinidb_vtable.cal_conn_info = (void*)(new cal_connection_info());
if (get_fe_conn_info_ptr() == NULL)
set_fe_conn_info_ptr((void*)new cal_connection_info());
cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(thd->infinidb_vtable.cal_conn_info);
cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
if (ci->localPm == -1)
{
@ -485,10 +486,10 @@ execplan::ReturnedColumn* buildPseudoColumn(Item* item,
bool& nonSupport,
uint32_t pseudoType)
{
if (!(gwi.thd->infinidb_vtable.cal_conn_info))
gwi.thd->infinidb_vtable.cal_conn_info = (void*)(new cal_connection_info());
if (get_fe_conn_info_ptr() == NULL)
set_fe_conn_info_ptr((void*)new cal_connection_info());
cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(gwi.thd->infinidb_vtable.cal_conn_info);
cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
Item_func* ifp = (Item_func*)item;