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

8
dbcon/mysql/ha_calpont.cpp
View File

@ -380,7 +380,6 @@ static int calpont_close_connection ( handlerton* hton, THD* thd )
ha_calpont::ha_calpont(handlerton* hton, TABLE_SHARE* table_arg) :
handler(hton, table_arg),
fe_conn_info(NULL),
int_table_flags(HA_BINLOG_STMT_CAPABLE | HA_BINLOG_ROW_CAPABLE |
HA_TABLE_SCAN_ON_INDEX |
HA_CAN_TABLE_CONDITION_PUSHDOWN)
@ -684,11 +683,10 @@ int ha_calpont::rnd_init(bool scan)
{
DBUG_ENTER("ha_calpont::rnd_init");
// Use global THD*
set_original_query(current_thd, current_thd->query_string.str());
mcs_handler_info mhi(static_cast<void*>(this), LEGACY);
String query_string_cpy; query_string_cpy.append(current_thd->query_string.str());
set_original_query(current_thd, query_string_cpy.c_ptr_safe());
int rc = ha_calpont_impl_rnd_init(table, mhi);
int rc = ha_calpont_impl_rnd_init(table);
DBUG_RETURN(rc);
}