From 0359a1fd3a8e06f13de42c2b735078fce7cefe0f Mon Sep 17 00:00:00 2001 From: Leonid Fedorov Date: Thu, 22 May 2025 11:35:53 +0000 Subject: [PATCH] chore(server_support): fixes to build columnstore branch with server >= 11.5 --- dbcon/mysql/ha_mcs_execplan.cpp | 7 ++++++- utils/funcexp/jsonhelpers.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dbcon/mysql/ha_mcs_execplan.cpp b/dbcon/mysql/ha_mcs_execplan.cpp index 23e706a2f..b2c7fe420 100644 --- a/dbcon/mysql/ha_mcs_execplan.cpp +++ b/dbcon/mysql/ha_mcs_execplan.cpp @@ -328,7 +328,12 @@ static execplan::Partitions getPartitions(TABLE* table) 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; diff --git a/utils/funcexp/jsonhelpers.cpp b/utils/funcexp/jsonhelpers.cpp index f6bab550c..99862d184 100644 --- a/utils/funcexp/jsonhelpers.cpp +++ b/utils/funcexp/jsonhelpers.cpp @@ -356,7 +356,7 @@ int parseJSPath(JSONPath& path, rowgroup::Row& row, execplan::SPTP& parm, bool w } bool matchJSPath(const vector& 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++) {