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

fix(plugin): this is to addres the original patch QA found in the original patch

Browse Source
This commit is contained in:
drrtuy
2023-11-22 16:20:37 +02:00
committed by GitHub
parent 5c9770d1e6
commit 26f5f8fe5c
4 changed files with 199 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
dbcon/mysql/ha_mcs.cpp
View File

@ -16,14 +16,6 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA. */
// This makes specific MDB classes' attributes public to implement
// MCOL-4740 temporary solution. Search for MCOL-4740
// to get the actual place where it is used.
#define updated_leaves \
updated_leaves; \
\
public:
#include "ha_mcs.h"
#include "maria_def.h"
#include <typeinfo>
@ -622,39 +614,10 @@ int ha_mcs::rnd_init(bool scan)
DBUG_RETURN(rc);
}
void update_counters_on_multi_update()
{
if (ha_mcs_common::isMultiUpdateStatement(current_thd->lex->sql_command) &&
!ha_mcs_common::isForeignTableUpdate(current_thd))
{
SELECT_LEX_UNIT* unit = &current_thd->lex->unit;
SELECT_LEX* select_lex = unit->first_select();
auto* multi = (select_lex->join) ? reinterpret_cast<multi_update*>(select_lex->join->result) : nullptr;
if (multi)
{
multi->table_to_update = multi->update_tables ? multi->update_tables->table : 0;
cal_impl_if::cal_connection_info* ci =
reinterpret_cast<cal_impl_if::cal_connection_info*>(get_fe_conn_info_ptr());
if (ci)
{
multi->updated = multi->found = ci->affectedRows;
}
}
}
}
int ha_mcs::rnd_end()
{
DBUG_ENTER("ha_mcs::rnd_end");
// MCOL-4740 multi_update::send_eof(), which outputs the affected
// number of rows to the client, is called after handler::rnd_end().
// So we set multi_update::updated and multi_update::found here.
update_counters_on_multi_update();
int rc;
try
{