1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +03:00

Merge branch 'stable-23.10' into feat/MCOL-6072-parallel-scan-4-CES-4

This commit is contained in:
drrtuy
2025-09-04 15:47:40 +00:00
49 changed files with 1371 additions and 534 deletions

View File

@@ -62,12 +62,25 @@ static int is_columnstore_columns_fill(THD* thd, TABLE_LIST* tables, COND* cond)
InformationSchemaCond isCond;
execplan::CalpontSystemCatalog csc;
const std::vector<
std::pair<execplan::CalpontSystemCatalog::OID, execplan::CalpontSystemCatalog::TableName> >
catalog_tables = csc.getTables();
// Use FE path for syscat queries issued from mysqld
csc.identity(execplan::CalpontSystemCatalog::FE);
std::vector<
std::pair<execplan::CalpontSystemCatalog::OID, execplan::CalpontSystemCatalog::TableName> >
catalog_tables;
try
{
catalog_tables = csc.getTables("", lower_case_table_names);
}
catch (IDBExcept&)
{
return 1;
}
catch (std::exception&)
{
return 1;
}
if (cond)
{
isCond.getCondItems(cond);