Merge branch '10.5' into bb-10.5-release

MariaDB · Nov 7, 2022 · fe330b6 · fe330b6
2 parents 177d858 + 9201cda
commit fe330b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=18
+MYSQL_VERSION_PATCH=19
 SERVER_MATURITY=stable
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c
@@ -23,7 +23,7 @@
 
 #ifndef MAIN
 
-#if defined(_AIX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__) || defined(__sun) || defined(_WIN32)
+#if defined(_AIX) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__linux__) || defined(__sun) || defined(_WIN32)
 static my_bool memcpy_and_test(uchar *to, uchar *from, uint len)
 {
   uint i, res= 1;