Merge branch '10.5' into bb-10.5-release

fe330b63 · Oleksandr Byelkin · 177d858e · 9201cda3 · fe330b63 · fe330b63
Commit fe330b63 authored Nov 07, 2022 by Oleksandr Byelkin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

VERSION VERSION +1 -1

mysys/my_gethwaddr.c mysys/my_gethwaddr.c +1 -1

No files found.
--- a/VERSION
+++ b/VERSION
 MYSQL_VERSION_MAJOR=10
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=18
+MYSQL_VERSION_PATCH=19
 SERVER_MATURITY=stable
--- 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;