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

chore(server_support): fixes to build columnstore branch with server >= 11.5

Browse Source
This commit is contained in:
Leonid Fedorov
2025-05-22 11:35:53 +00:00
committed by Leonid Fedorov
parent 1c8984fbf6
commit 0359a1fd3a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dbcon/mysql/ha_mcs_execplan.cpp
View File

@ -328,7 +328,12 @@ static execplan::Partitions getPartitions(TABLE* table)
while ((pe = part_el_it++)) // this is how server does it. while ((pe = part_el_it++)) // this is how server does it.
{ {
result.fPartNames.emplace_back(pe->partition_name); // TODO: partition names are not just strings in
#if MYSQL_VERSION_ID >= 110501
result.fPartNames.emplace_back(pe->partition_name.str);
#else
result.fPartNames.emplace_back(pe->partition_name);
#endif
} }
} }
return result; return result;

2
utils/funcexp/jsonhelpers.cpp
View File

@ -356,7 +356,7 @@ int parseJSPath(JSONPath& path, rowgroup::Row& row, execplan::SPTP& parm, bool w
} }
bool matchJSPath(const vector<funcexp::JSONPath>& paths, const json_path_t* p, json_value_types valType, bool matchJSPath(const vector<funcexp::JSONPath>& paths, const json_path_t* p, json_value_types valType,
const int* /*arrayCounter*/, bool exact) [[maybe_unused]] const int* arrayCounter, bool exact)
{ {
for (size_t curr = 0; curr < paths.size(); curr++) for (size_t curr = 0; curr < paths.size(); curr++)
{ {