Merge branch '10.5' into bb-10.5-release

sanja-byelkin · sanja-byelkin · commit fe330b63fe4e · 2022-11-07T16:14:35.000+01:00
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;

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`#ifndef MAIN`
`25`	`25`
`26`		`-#if defined(_AIX) \|\| defined(__APPLE__) \|\| defined(__FreeBSD__) \|\| defined(__linux__) \|\| defined(__sun) \|\| defined(_WIN32)`
	`26`	`+#if defined(_AIX) \|\| defined(__APPLE__) \|\| defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__linux__) \|\| defined(__sun) \|\| defined(_WIN32)`
`27`	`27`	`static my_bool memcpy_and_test(uchar to, uchar from, uint len)`
`28`	`28`	`{`
`29`	`29`	`uint i, res= 1;`