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

Merge pull request #1527 from tntnatbry/MCOL-4285-insertselect-fix

Browse Source 
MCOL-4285 For Insert...Select, pass the is_cache_insert=true
This commit is contained in:
David.Hall
2020-10-27 10:23:17 -05:00
committed by GitHub
parent b175f06a97 50a4fd9f39
commit 56e581eb39
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dbcon/mysql/ha_mcs.cpp
View File

@ -1219,6 +1219,8 @@ my_bool get_status_and_flush_cache(void *param,
int error; int error;
enum_sql_command sql_command= cache->table->in_use->lex->sql_command; enum_sql_command sql_command= cache->table->in_use->lex->sql_command;
cache->sql_command= sql_command;
cache->insert_command= (sql_command == SQLCOM_INSERT || cache->insert_command= (sql_command == SQLCOM_INSERT ||
sql_command == SQLCOM_LOAD); sql_command == SQLCOM_LOAD);
/* /*
@ -1781,7 +1783,16 @@ void ha_mcs_cache::start_bulk_insert(ha_rows rows, uint flags)
bzero(&cache_handler->copy_info, sizeof(cache_handler->copy_info)); bzero(&cache_handler->copy_info, sizeof(cache_handler->copy_info));
return cache_handler->start_bulk_insert(rows, flags); return cache_handler->start_bulk_insert(rows, flags);
} }
return parent::start_bulk_insert(rows, flags); else if (sql_command == SQLCOM_INSERT_SELECT)
{
return parent::start_bulk_insert_from_cache(rows, flags);
}
// sql_command == SQLCOM_END:
// See the comment in get_status_and_flush_cache
else
{
return parent::start_bulk_insert(rows, flags);
}
} }
else else
{ {

1
dbcon/mysql/ha_mcs.h
View File

@ -285,6 +285,7 @@ class ha_mcs_cache :public ha_mcs
typedef ha_mcs parent; typedef ha_mcs parent;
int original_lock_type; int original_lock_type;
bool insert_command, cache_locked; bool insert_command, cache_locked;
enum_sql_command sql_command;
// True if this handler belongs to either calpontsys.systable or // True if this handler belongs to either calpontsys.systable or
// calpontsys.syscolumn system catalog tables // calpontsys.syscolumn system catalog tables