Merge branch '2.4' into 2.5

mariadb-joecotellese · Nov 17, 2020 · 9015bcd · 9015bcd
2 parents d93e5a3 + 9ed51b6
commit 9015bcd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/server/core/server.cc b/server/core/server.cc
@@ -846,7 +846,7 @@ void Server::VersionInfo::set(uint64_t version, const std::string& version_str)
 
     Type new_type = Type::UNKNOWN;
     auto version_strz = version_str.c_str();
-    if (strcasestr(version_strz, "clustrix"))
+    if (strcasestr(version_strz, "xpand") || strcasestr(version_strz, "clustrix"))
     {
         new_type = Type::CLUSTRIX;
     }