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

MCOL-4152 Reset cond_stack with ha_mcs::reset() call

Browse Source
This commit is contained in:
Roman Nozdrin
2020-07-13 13:18:57 +00:00
parent d41a4739de
commit 6b3c6e33c5
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbcon/mysql/ha_mcs.cpp
View File

@ -1156,6 +1156,20 @@ void ha_mcs::cond_pop()
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
int ha_mcs::reset()
{
DBUG_ENTER("ha_mcs::reset");
if (!condStack.empty())
{
condStack.clear();
}
DBUG_RETURN(0);
}
int ha_mcs::repair(THD* thd, HA_CHECK_OPT* check_opt) int ha_mcs::repair(THD* thd, HA_CHECK_OPT* check_opt)
{ {
DBUG_ENTER("ha_mcs::repair"); DBUG_ENTER("ha_mcs::repair");

1
dbcon/mysql/ha_mcs.h
View File

@ -215,6 +215,7 @@ public:
int rnd_end(); int rnd_end();
int rnd_next(uchar* buf); ///< required int rnd_next(uchar* buf); ///< required
int rnd_pos(uchar* buf, uchar* pos); ///< required int rnd_pos(uchar* buf, uchar* pos); ///< required
int reset() override;
void position(const uchar* record); ///< required void position(const uchar* record); ///< required
int info(uint32_t); ///< required int info(uint32_t); ///< required
int extra(enum ha_extra_function operation); int extra(enum ha_extra_function operation);