database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-05 15:41:14 +03:00
Code Activity

MCOL-4805 Follow up.

Browse Source
This commit is contained in:
Gagan Goel
2021-08-04 23:54:02 +00:00
parent e0136e578b
commit 649ca10429
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dbcon/mysql/ha_mcs_impl.cpp
View File

@ -2228,8 +2228,6 @@ int ha_mcs::impl_rnd_init(TABLE* table, const std::vector<COND*>& condStack)
thd_set_ha_data(thd, mcs_hton, reinterpret_cast<void*>(0x42)); thd_set_ha_data(thd, mcs_hton, reinterpret_cast<void*>(0x42));
} }
cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
#if 0 #if 0
if (thd->rgi_slave && thd->rgi_slave->m_table_map.count() != 0) if (thd->rgi_slave && thd->rgi_slave->m_table_map.count() != 0)
{ {
@ -2264,6 +2262,8 @@ int ha_mcs::impl_rnd_init(TABLE* table, const std::vector<COND*>& condStack)
if (get_fe_conn_info_ptr() == nullptr) if (get_fe_conn_info_ptr() == nullptr)
set_fe_conn_info_ptr((void*)new cal_connection_info()); set_fe_conn_info_ptr((void*)new cal_connection_info());
cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
idbassert(ci != 0); idbassert(ci != 0);
if (thd->killed == KILL_QUERY || thd->killed == KILL_QUERY_HARD) if (thd->killed == KILL_QUERY || thd->killed == KILL_QUERY_HARD)
@ -2582,8 +2582,6 @@ int ha_mcs_impl_rnd_next(uchar* buf, TABLE* table)
thd->lex->sql_command == SQLCOM_LOAD)) thd->lex->sql_command == SQLCOM_LOAD))
return HA_ERR_END_OF_FILE; return HA_ERR_END_OF_FILE;
cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
if (isUpdateOrDeleteStatement(thd->lex->sql_command, !isForeignTableUpdate(thd))) if (isUpdateOrDeleteStatement(thd->lex->sql_command, !isForeignTableUpdate(thd)))
return HA_ERR_END_OF_FILE; return HA_ERR_END_OF_FILE;
@ -2595,6 +2593,8 @@ int ha_mcs_impl_rnd_next(uchar* buf, TABLE* table)
if (get_fe_conn_info_ptr() == nullptr) if (get_fe_conn_info_ptr() == nullptr)
set_fe_conn_info_ptr((void*)new cal_connection_info()); set_fe_conn_info_ptr((void*)new cal_connection_info());
cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
if (thd->killed == KILL_QUERY || thd->killed == KILL_QUERY_HARD) if (thd->killed == KILL_QUERY || thd->killed == KILL_QUERY_HARD)
{ {
force_close_fep_conn(thd, ci); force_close_fep_conn(thd, ci);
@ -4627,6 +4627,12 @@ int ha_mcs_impl_group_by_end(TABLE* table)
if (get_fe_conn_info_ptr() != NULL) if (get_fe_conn_info_ptr() != NULL)
ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr()); ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
if (!ci)
{
set_fe_conn_info_ptr((void*)new cal_connection_info());
ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
}
if (((thd->lex)->sql_command == SQLCOM_INSERT) || if (((thd->lex)->sql_command == SQLCOM_INSERT) ||
((thd->lex)->sql_command == SQLCOM_INSERT_SELECT) ) ((thd->lex)->sql_command == SQLCOM_INSERT_SELECT) )
{ {
@ -4634,12 +4640,6 @@ int ha_mcs_impl_group_by_end(TABLE* table)
return rc; return rc;
} }
if (!ci)
{
set_fe_conn_info_ptr((void*)new cal_connection_info());
ci = reinterpret_cast<cal_connection_info*>(get_fe_conn_info_ptr());
}
if (thd->killed == KILL_QUERY || thd->killed == KILL_QUERY_HARD) if (thd->killed == KILL_QUERY || thd->killed == KILL_QUERY_HARD)
{ {
force_close_fep_conn(thd, ci); force_close_fep_conn(thd, ci);