Merge branch '10.5' into bb-10.5-release

This commit is contained in:
Oleksandr Byelkin 2022-11-07 16:14:35 +01:00
commit fe330b63fe
2 changed files with 2 additions and 2 deletions

View file

@ -1,4 +1,4 @@
MYSQL_VERSION_MAJOR=10
MYSQL_VERSION_MINOR=5
MYSQL_VERSION_PATCH=18
MYSQL_VERSION_PATCH=19
SERVER_MATURITY=stable

View file

@ -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;