rondb-24.10.4.patch

diff --git a/storage/ndb/include/ndbapi/NdbAggregator.hpp b/storage/ndb/include/ndbapi/NdbAggregator.hpp
index 355ece45e87..da4a8391678 100644
--- a/storage/ndb/include/ndbapi/NdbAggregator.hpp
+++ b/storage/ndb/include/ndbapi/NdbAggregator.hpp
@@ -74,9 +74,9 @@ static AggregationError g_errors_[] = {
 
 class NdbAggregator {
  public:
-  class Column {
+  class NdbAggregator_Column {
    public:
-    Column(Uint32 id, NdbDictionary::Column::Type type, Uint32 byte_size,
+    NdbAggregator_Column(Uint32 id, NdbDictionary::Column::Type type, Uint32 byte_size,
            bool is_null, char* ptr, bool end) :
       id_(id), type_(type), byte_size_(byte_size), is_null_(is_null),
       ptr_(ptr), end_(end) {
@@ -205,7 +205,7 @@ class NdbAggregator {
     bool end() {
       return end_;
     }
-    Column FetchGroupbyColumn();
+    NdbAggregator_Column FetchGroupbyColumn();
     Result FetchAggregationResult();
    private:
     const NdbAggregator* aggregator_;