RONDB-785, RONDB-789: Compilation fixes

logicalclocks · Dec 4, 2024 · f4621c6 · f4621c6
1 parent 4f5b147
commit f4621c6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/storage/ndb/include/ndb_version.h.in b/storage/ndb/include/ndb_version.h.in
@@ -944,7 +944,7 @@ ndbd_support_set_location_domain_id(Uint32 x)
   {
     return true;
   }
-  if ((major == 24) && (minor == 10) && (rel >= 0))
+  if ((major == 24) && (minor == 10))
   {
     return true;
   }

diff --git a/storage/ndb/src/common/portlib/NdbHW.cpp b/storage/ndb/src/common/portlib/NdbHW.cpp
@@ -2154,11 +2154,12 @@ get_meminfo(struct ndb_hwinfo *hwinfo)
   if (cgroup_meminfo != nullptr) {
     hwinfo->is_running_in_container = 1;
     FileGuard g(cgroup_meminfo); // close at end...
-    int ret_code = fgets(buf, sizeof(buf), cgroup_meminfo))
-    Uint64 memory_size = 0;
-    if (sscanf(buf, "%llu", &memory_size) == 1) {
-      hwinfo->hw_memory_size = memory_size;
-      return 0;
+    if (fgets(buf, sizeof(buf), cgroup_meminfo)) {
+      Uint64 memory_size = 0;
+      if (sscanf(buf, "%llu", &memory_size) == 1) {
+        hwinfo->hw_memory_size = memory_size;
+        return 0;
+      }
     }
     perror("failed to read /sys/fs/cgroup/memory.max");
     return -1;