mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
mariadb: 11.4.8
11.4.7 fixes a huge performance drop from 11.4.5 to 11.4.6. https://mariadb.com/docs/release-notes/community-server/mariadb-11-4-series/mariadb-11.4.7-release-notes 11.4.8 fixes several crash problems and other issues. https://mariadb.com/docs/release-notes/community-server/mariadb-11-4-series/mariadb-11.4.8-release-notes Removed 0001-aio_linux-Check-if-syscall-exists-before-using-it.patch which is not applicable anymore, the code was rewritten. Adapted 0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch to fix fuzz. Add libxml2-native to DEPENDS in mariadb-native to fix the do_configure failure with the new version. Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
90ed8e2bd5
commit
f3cd830c09
|
|
@ -3,7 +3,7 @@ inherit native
|
||||||
|
|
||||||
PROVIDES += "mysql5-native"
|
PROVIDES += "mysql5-native"
|
||||||
DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native \
|
DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native \
|
||||||
gnutls-native fmt-native \
|
libxml2-native gnutls-native fmt-native \
|
||||||
"
|
"
|
||||||
|
|
||||||
RDEPENDS:${PN} = ""
|
RDEPENDS:${PN} = ""
|
||||||
|
|
@ -15,7 +15,6 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
|
||||||
file://fix-arm-atomic.patch \
|
file://fix-arm-atomic.patch \
|
||||||
file://0001-Fix-library-LZ4-lookup.patch \
|
file://0001-Fix-library-LZ4-lookup.patch \
|
||||||
file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
|
file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
|
||||||
file://0001-aio_linux-Check-if-syscall-exists-before-using-it.patch \
|
|
||||||
file://ssize_t.patch \
|
file://ssize_t.patch \
|
||||||
file://sys_futex.patch \
|
file://sys_futex.patch \
|
||||||
file://cross-compiling.patch \
|
file://cross-compiling.patch \
|
||||||
|
|
@ -26,7 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
|
||||||
file://riscv32.patch \
|
file://riscv32.patch \
|
||||||
file://0001-Remove-x86-specific-loop-in-my_convert.patch \
|
file://0001-Remove-x86-specific-loop-in-my_convert.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "1b26c0bb2d025dbfac3b9852d2b7eafda56a171b67ac2e27831ec0414fb7df07"
|
SRC_URI[sha256sum] = "52fa4dca2c5f80afc1667d523a27c06176d98532298a6b0c31ed73505f49e15c"
|
||||||
|
|
||||||
UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags"
|
UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,40 +0,0 @@
|
||||||
From f9f019049a9bb09471e8303d4510afae07f225c8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Wed, 18 Aug 2021 06:49:25 +0000
|
|
||||||
Subject: [PATCH] aio_linux: Check if syscall exists before using it
|
|
||||||
|
|
||||||
Return -ENOSYS if not implememented, fixes build on arches like RISCV32
|
|
||||||
Fixes
|
|
||||||
tpool/aio_linux.cc:63:20: error: '__NR_io_getevents' was not declared in this scope; did you mean 'io_getevents'?
|
|
||||||
63 | int ret= syscall(__NR_io_getevents, reinterpret_cast<long>(ctx),
|
|
||||||
| ^~~~~~~~~~~~~~~~~
|
|
||||||
| io_getevents
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
tpool/aio_linux.cc | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc
|
|
||||||
index 507c6b92..a6adf1af 100644
|
|
||||||
--- a/tpool/aio_linux.cc
|
|
||||||
+++ b/tpool/aio_linux.cc
|
|
||||||
@@ -59,6 +59,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
|
|
||||||
*/
|
|
||||||
static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev)
|
|
||||||
{
|
|
||||||
+#ifdef __NR_io_getevents
|
|
||||||
int saved_errno= errno;
|
|
||||||
int ret= syscall(__NR_io_getevents, reinterpret_cast<long>(ctx),
|
|
||||||
min_nr, nr, ev, 0);
|
|
||||||
@@ -68,6 +69,9 @@ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev)
|
|
||||||
errno= saved_errno;
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
+#else
|
|
||||||
+ return -ENOSYS;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -18,8 +18,8 @@ diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
|
||||||
index 0195555e..507136cb 100644
|
index 0195555e..507136cb 100644
|
||||||
--- a/sql/CMakeLists.txt
|
--- a/sql/CMakeLists.txt
|
||||||
+++ b/sql/CMakeLists.txt
|
+++ b/sql/CMakeLists.txt
|
||||||
@@ -64,11 +64,18 @@ ${CMAKE_BINARY_DIR}/sql
|
@@ -63,11 +63,18 @@
|
||||||
${CMAKE_SOURCE_DIR}/tpool
|
${CMAKE_BINARY_DIR}/sql
|
||||||
)
|
)
|
||||||
|
|
||||||
-ADD_CUSTOM_COMMAND(
|
-ADD_CUSTOM_COMMAND(
|
||||||
|
|
@ -41,7 +41,7 @@ index 0195555e..507136cb 100644
|
||||||
|
|
||||||
FIND_PACKAGE(BISON 2.4)
|
FIND_PACKAGE(BISON 2.4)
|
||||||
|
|
||||||
@@ -405,11 +412,18 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR)
|
@@ -405,11 +412,18 @@
|
||||||
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
|
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user