From patchwork Thu Oct 2 10:48:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= X-Patchwork-Id: 71511 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A666CCA471 for ; Thu, 2 Oct 2025 10:49:06 +0000 (UTC) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by mx.groups.io with SMTP id smtpd.web11.5819.1759402138223231530 for ; Thu, 02 Oct 2025 03:48:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XQ57823V; spf=pass (domain: gmail.com, ip: 209.85.216.47, mailfrom: zboszor@gmail.com) Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-3306b83ebdaso926373a91.3 for ; Thu, 02 Oct 2025 03:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759402137; x=1760006937; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4xqScypscYYOEBxwBj3wNqmME2xN9VE/i3R5suijJe4=; b=XQ57823VNOfXwmQihhihLqZuTtGk465zFxb2pxx4w1HZbhBg9VhiKXPTlDVVAYc0oF zxzZdjK6A5KxMLlfjF9/UfhiNCurAgTcONBya350zlvISMP1D2Bgp1mi8154dfKlbgs9 kYckwAaBIe4AfQp7cySSUY//7GWzsDptbamR9m0GgX6n1RF06Z5qLy+FeFYBydNQI9Nu 3lhNqWBfEQEULzURIOLnmxVAH9mxaUkObozpOzjGEPOPahLatV8kxFM1o//lJ9OB9a+8 cuUCwUuaZIkfTYJX4gB5OOB+FPgqB3STquw4+SRXpyEIuOPHvcTvAfZ2fsjtWghKGg0r bHxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759402137; x=1760006937; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4xqScypscYYOEBxwBj3wNqmME2xN9VE/i3R5suijJe4=; b=F5JNEZZM982bH30MCO7JBTV9bOTJCl9KxwEjZAiHvclxPTJ4lwI7+RgP+4WyjGkw9t 9dhBwLjuS3t/tCFlE9+779R2B24nQmgKmZvBSNURRKT+vVLIcGLPPmGSrX3BJ6qEiwzA fXIBLO+HPK3D0MOWWbXmjOUi5ocatqwt23KZgLip3d1oGf/sXtLPsNYOQG8FzZzeYoQn mgYjxc0e+duqqFnFGxa5gu6cjdxr7tmtQnFADEXNSziUmjfMyCXy1kpjB5vYIblHzzPL 9Ybk4hVihSccZyunQCERan5Kkcq6izRKK66mM5fEU/V93hldcFafIlbVbrhfgX9nO8OO 1dnQ== X-Gm-Message-State: AOJu0Yyc3kJTz4ZgB07+TJX5HTUkVFViNa6JrN9zJH5UK0ycAz6QFGfu bjXb7Q0tZ0Q6svyjodZl17ve5m9RtMvbYxLbVhIuFMN7qK0EIWHcoVBYVd+Tbuwn X-Gm-Gg: ASbGncsDf/1G/OC8c2q/Eh95YQvX9jiMaPh4I7+t4XiDNCM+pBE00iADFtQ5bE0Uz0s 6uEruUcna2PzJJ/NjqruYnBsuFdZDuUC1EUIvM4IjONcoe5dbo0nrnML0AJfEFvJTzH7WVL7Lhn ZxmzN9A7Ls51uQMnL8oqtCryWOY0JWXdqbJsRWLhKmXcW69kjwkGOVRQGG3S846+ygTYTAz7uAp DKWDDn2bnMh2JjZut8X3LOCKjQQvN2RuE2i8fZ2AXSuRgaaEZf74YUNRK8E74CFP3talr/amEVL +G67tBW1EB26rcfTq9WGdMijtIxntRwO/Ug4BmCgmo+9PwiBqGE4N4q9mf5smlTfVYazXFFYQJd +eLchKRGxbVncuJTcXAntiBNv8AP9pn4aOI6/PL9zedCX5YS1wQofL5Z6uh/tnUUrQScFxJTbNB RbMbs= X-Google-Smtp-Source: AGHT+IF3sZMbxTG/6vah97qOXKEhqOVVKThY99nl4dxgdDxF7C46LySNgYixV+DMMgMgzfObfQLJLw== X-Received: by 2002:a17:90b:38c6:b0:327:ba77:a47 with SMTP id 98e67ed59e1d1-339a6e9ac24mr8819718a91.15.1759402136982; Thu, 02 Oct 2025 03:48:56 -0700 (PDT) Received: from fedora (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-339a6ebdac1sm4803568a91.9.2025.10.02.03.48.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Oct 2025 03:48:56 -0700 (PDT) From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55?= =?utf-8?b?aQ==?= Subject: [meta-oe][PATCH v2 1/2] mariadb: Fix a crash in my_convert() Date: Thu, 2 Oct 2025 12:48:46 +0200 Message-ID: <20251002104847.1472184-1-zboszor@gmail.com> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Oct 2025 10:49:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/120166 In some cases (most notably when running mysqldump), the server crashes in the my_convert() function, in a code protected by #if defined(__i386__) || defined(__x86_64__) ... #endif The crash does not happen with the generic code. Remove the x86[-64] specific optimization. This change was endorsed in https://jira.mariadb.org/browse/MDEV-37786 Signed-off-by: Zoltán Böszörményi --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + ...move-x86-specific-loop-in-my_convert.patch | 93 +++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-x86-specific-loop-in-my_convert.patch diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 13e55ebacd..67dd687c02 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -24,6 +24,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://0001-Ensure-compatibility-with-ARMv9-by-updating-.arch-di.patch \ file://riscv32.patch \ + file://0001-Remove-x86-specific-loop-in-my_convert.patch \ " SRC_URI[sha256sum] = "1b26c0bb2d025dbfac3b9852d2b7eafda56a171b67ac2e27831ec0414fb7df07" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-x86-specific-loop-in-my_convert.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-x86-specific-loop-in-my_convert.patch new file mode 100644 index 0000000000..afcf4fe843 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-x86-specific-loop-in-my_convert.patch @@ -0,0 +1,93 @@ +From 79d2a95391abc133e86688696ae21628b7035b2d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= + +Date: Wed, 1 Oct 2025 09:29:04 +0200 +Subject: [PATCH] Remove x86 specific loop in my_convert() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +mysqldump/mariadb-dump crashes with this backtrace: + +| (gdb) bt +| #0 my_convert (to=, to_length=160, to_cs=0x55b5740fbda0 , from=, from_length=40, +| from_cs=0x55b57408bda0 , errors=0x7f950c35cd6c) at /usr/src/debug/mariadb/11.8.3/strings/ctype.c:1256 +| #1 0x000055b572d9f4a0 in copy_and_convert (to=0x7f94fc00c9db "Configuratiogicate_log\020automagicate_log\017is_done_message\017is_done_message", +| to_length=, to_cs=, from=0x7f94fc059f37 "Configuration downloading from portal...", from_length=40, from_cs=, +| errors=0x7f950c35cd6c) at /usr/src/debug/mariadb/11.8.3/sql/sql_string.h:53 +| #2 Protocol::net_store_data_cs (this=0x7f94fc001260, from=0x7f94fc059f37 "Configuration downloading from portal...", length=40, from_cs=, +| to_cs=) at /usr/src/debug/mariadb/11.8.3/sql/protocol.cc:114 +| #3 0x000055b572da103f in Protocol::send_result_set_row (this=this@entry=0x7f94fc001260, row_items=row_items@entry=0x7f94fc013418) +| at /usr/src/debug/mariadb/11.8.3/sql/protocol.cc:1359 +| #4 0x000055b572e19442 in select_send::send_data (this=0x7f94fc014f78, items=...) at /usr/src/debug/mariadb/11.8.3/sql/sql_class.cc:3294 +| #5 0x000055b572ef7c69 in select_result_sink::send_data_with_check (u=, sent=, this=, items=...) +| at /usr/src/debug/mariadb/11.8.3/sql/sql_class.h:6264 +| #6 select_result_sink::send_data_with_check (this=, items=..., u=, sent=) +| at /usr/src/debug/mariadb/11.8.3/sql/sql_class.h:6254 +| #7 end_send (join=, join_tab=, end_of_records=) at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:25629 +| #8 0x000055b572ec38b6 in evaluate_join_record (join=join@entry=0x7f94fc014fa0, join_tab=join_tab@entry=0x7f94fc016940, error=error@entry=0) +| at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:24523 +| #9 0x000055b572edcbf2 in sub_select (join=0x7f94fc014fa0, join_tab=0x7f94fc016940, end_of_records=) +| at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:24290 +| #10 0x000055b572f119c6 in do_select (join=0x7f94fc014fa0, procedure=) at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:23801 +| #11 JOIN::exec_inner (this=this@entry=0x7f94fc014fa0) at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:5071 +| #12 0x000055b572f11d43 in JOIN::exec (this=this@entry=0x7f94fc014fa0) at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:4859 +| #13 0x000055b572f0ffe6 in mysql_select (thd=thd@entry=0x7f94fc000cd8, tables=0x7f94fc013f38, fields=..., conds=0x0, og_num=0, order=0x0, group=0x0, having=0x0, +| proc_param=0x0, select_options=551922436864, result=0x7f94fc014f78, unit=0x7f94fc005038, select_lex=0x7f94fc013160) +| at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:5387 +| #14 0x000055b572f107dd in handle_select (thd=thd@entry=0x7f94fc000cd8, lex=lex@entry=0x7f94fc004f58, result=result@entry=0x7f94fc014f78, +| setup_tables_done_option=setup_tables_done_option@entry=0) at /usr/src/debug/mariadb/11.8.3/sql/sql_select.cc:633 +| #15 0x000055b572e77d9e in execute_sqlcom_select (thd=thd@entry=0x7f94fc000cd8, all_tables=0x7f94fc013f38) at /usr/src/debug/mariadb/11.8.3/sql/sql_parse.cc:6190 +| #16 0x000055b572e877be in mysql_execute_command (thd=thd@entry=0x7f94fc000cd8, is_called_from_prepared_stmt=is_called_from_prepared_stmt@entry=false) +| at /usr/src/debug/mariadb/11.8.3/sql/sql_parse.cc:3975 +| #17 0x000055b572e88e03 in mysql_parse (thd=0x7f94fc000cd8, rawbuf=, length=, parser_state=) +| at /usr/src/debug/mariadb/11.8.3/sql/sql_parse.cc:7905 +| #18 0x000055b572e8b2a1 in dispatch_command (command=command@entry=COM_QUERY, thd=thd@entry=0x7f94fc000cd8, packet=packet@entry=0x7f94fc0088a9 "", +| packet_length=packet_length@entry=152, blocking=blocking@entry=true) at /usr/src/debug/mariadb/11.8.3/sql/sql_parse.cc:1903 +| #19 0x000055b572e8cf7c in do_command (thd=thd@entry=0x7f94fc000cd8, blocking=blocking@entry=true) at /usr/src/debug/mariadb/11.8.3/sql/sql_parse.cc:1416 +| #20 0x000055b572fcfc0d in do_handle_one_connection (connect=, put_in_cache=true) at /usr/src/debug/mariadb/11.8.3/sql/sql_connect.cc:1415 +| #21 0x000055b572fcffc5 in handle_one_connection (arg=arg@entry=0x55b57943cbd8) at /usr/src/debug/mariadb/11.8.3/sql/sql_connect.cc:1327 +| #22 0x000055b573382440 in pfs_spawn_thread (arg=0x55b5795eb598) at /usr/src/debug/mariadb/11.8.3/storage/perfschema/pfs.cc:2198 +| #23 0x00007f952e8571dd in start_thread (arg=) at pthread_create.c:448 +| #24 0x00007f952e8d318c in __GI___clone3 () at ../sysdeps/unix/sysv/linux/x86_64/clone3.S:78 + +See also: +https://jira.mariadb.org/browse/MDEV-37786 +https://jira.mariadb.org/browse/MDEV-37148 + +Signed-off-by: Zoltán Böszörményi +Upstream-Status: Inappropriate [oe specific] +--- + strings/ctype.c | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/strings/ctype.c b/strings/ctype.c +index 629514e5e9c..d7e788c693b 100644 +--- a/strings/ctype.c ++++ b/strings/ctype.c +@@ -1243,22 +1243,6 @@ my_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, + + length= length2= MY_MIN(to_length, from_length); + +-#if defined(__i386__) || defined(__x86_64__) +- /* +- Special loop for i386, it allows to refer to a +- non-aligned memory block as UINT32, which makes +- it possible to copy four bytes at once. This +- gives about 10% performance improvement comparing +- to byte-by-byte loop. +- */ +- for ( ; length >= 4; length-= 4, from+= 4, to+= 4) +- { +- if ((*(uint32*)from) & 0x80808080) +- break; +- *((uint32*) to)= *((const uint32*) from); +- } +-#endif /* __i386__ */ +- + for (; ; *to++= *from++, length--) + { + if (!length) +-- +2.51.0 + From patchwork Thu Oct 2 10:48:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= X-Patchwork-Id: 71510 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24B91CAC5B0 for ; Thu, 2 Oct 2025 10:49:06 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web10.5450.1759402141343154418 for ; Thu, 02 Oct 2025 03:49:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=lJeQj9ey; spf=pass (domain: gmail.com, ip: 209.85.210.180, mailfrom: zboszor@gmail.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-781997d195aso689639b3a.3 for ; Thu, 02 Oct 2025 03:49:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759402140; x=1760006940; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8oNKInnfrIHzLDQSPgNQ7U6WUm2x5m1iRR+/V9C5nIg=; b=lJeQj9eyrC94TcCIREBQnzQfIy+Fj8uTFI3WfhW0GbpyQuyhXgN/UgU54g5Y7czKxm Ajam4UuJzxy3IaLTr86MCfvv3PcoE2bIShweEeJKqcraEVZPEVyYdBC+Y8q8Lky89jC4 gIfESX07T1XWOAWxats9ZC2DHRMCl5czfm/glEYtiiaY+wbc7BaYdSJii5NZ7NMrBrWO RyZ+w3WqovbUrSJ1h+MaCFEvu3cPUm31IIqYCd0rvZTbZ5x03B9xpBwvr3SCFi5J4LuN yijCwBHACA/wBrPS5u4Evcfmcwqtul+svCsTWHzEwN/9BJ5V+H127czjPV+6QOUnZ600 93aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759402140; x=1760006940; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8oNKInnfrIHzLDQSPgNQ7U6WUm2x5m1iRR+/V9C5nIg=; b=GZzV3FmznezHEofT1Ut9ioN2agWH5nCJRABUN3Ez3t1ezNaDOeq/KXwRWHcSku+L0v YrRkVNCU9h6mM7glSRNj+qCphw2UWzSn3+G1PDlZu5YHvvPH3do8I0LFCZFPEeJrb5T5 nPCiTdLD9BV8fbAcQmFboXyXyCie0bNWGiR3EZS5WaXbA/i0y7hnmjV6hGkQRStk6kgM epsWnxXCblMwebROiAKeZYPRQes6yp85k9KudQG8S9dfQrEFCsG6AH/B1S3hgK89xHz7 uRi3EmNnFZq8Op2oZTZ7nfotojVgIeoy55VPkgP2pmHQHClAXVrs3XJ9Ri07K8o194XV H9DQ== X-Gm-Message-State: AOJu0YyZBlZd2fP6tOfZUyLlZT0KvFtIgzUxiWVvK6vW28e7de+joz5N /0vwUU7iZNErf92n5lHMekxOGYE+UtO3bGyybLe5Fz7SKSgQnH1IRBryRYv2WzZ8 X-Gm-Gg: ASbGncsEmr3gSAIG++Xthh3SAaZXSf/HXI63rwIemMkWa6tdgeoz+N6pgy0pmLg5tN1 zpcs43cxoEHBQ45EiP8otdamMg1vSzJ2CeFM0pnofsFsGwN/uif/a2hAbr1P1Zvkupb4apT15dD KQZhOgsh2uozF4RQVWzlYDROR5YGd3sEbkGZDN0PycKIom3bvqYtNxxm6AdpNtMkMLsooVzPJxm 3kshUtwDgFnmPyVPpbzZudRvi+oQqfw8LcI2vPRjam38yaVrR5eGQr1PMxUcuUjK+T8K1aQQqtI NRyhtpD9X7tqGkNSelVPDrVf4qxaCpse+N/wDZ/OK/hsrecDqzlqY9tPP5i4TzMjIMTh3amiQkS PxGMyG5NiOLMMagf0j71GJF51WAU46OG30a9XtlZ+H6E8FDl8hzL86OAaT161HH/X8M6X X-Google-Smtp-Source: AGHT+IEkBdM8otCZ1S3C+YJ0JB3ZizmcHQ1r9b752+hHCvO78KJxnMKWExKDBIjS8DOnxvVgWIRvrw== X-Received: by 2002:a17:90b:314e:b0:335:228c:6f1f with SMTP id 98e67ed59e1d1-339a6e95d23mr9623163a91.12.1759402140312; Thu, 02 Oct 2025 03:49:00 -0700 (PDT) Received: from fedora (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-339a6ebdac1sm4803568a91.9.2025.10.02.03.48.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Oct 2025 03:48:59 -0700 (PDT) From: =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55aQ==?= To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , =?utf-8?b?Wm9sdMOhbiBCw7ZzesO2cm3DqW55?= =?utf-8?b?aQ==?= Subject: [meta-oe][PATCH v2 2/2] mariadb: 11.4.8 Date: Thu, 2 Oct 2025 12:48:47 +0200 Message-ID: <20251002104847.1472184-2-zboszor@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251002104847.1472184-1-zboszor@gmail.com> References: <20251002104847.1472184-1-zboszor@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 02 Oct 2025 10:49:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/120167 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 --- ...ive_11.4.6.bb => mariadb-native_11.4.8.bb} | 2 +- meta-oe/recipes-dbs/mysql/mariadb.inc | 3 +- ...ck-if-syscall-exists-before-using-it.patch | 40 ------------------- ...Lists.txt-fix-gen_lex_hash-not-found.patch | 6 +-- .../{mariadb_11.4.6.bb => mariadb_11.4.8.bb} | 0 5 files changed, 5 insertions(+), 46 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_11.4.6.bb => mariadb-native_11.4.8.bb} (92%) delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch rename meta-oe/recipes-dbs/mysql/{mariadb_11.4.6.bb => mariadb_11.4.8.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.6.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.8.bb similarity index 92% rename from meta-oe/recipes-dbs/mysql/mariadb-native_11.4.6.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_11.4.8.bb index 578357b480..ff48dcd806 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.6.bb +++ b/meta-oe/recipes-dbs/mysql/mariadb-native_11.4.8.bb @@ -3,7 +3,7 @@ inherit native PROVIDES += "mysql5-native" DEPENDS = "ncurses-native zlib-native bison-native libpcre2-native \ -gnutls-native fmt-native \ +libxml2-native gnutls-native fmt-native \ " RDEPENDS:${PN} = "" diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 67dd687c02..53a24d14bc 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -15,7 +15,6 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://fix-arm-atomic.patch \ file://0001-Fix-library-LZ4-lookup.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://sys_futex.patch \ file://cross-compiling.patch \ @@ -26,7 +25,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://riscv32.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" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch deleted file mode 100644 index eddfdaaf77..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f9f019049a9bb09471e8303d4510afae07f225c8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -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(ctx), - | ^~~~~~~~~~~~~~~~~ - | io_getevents - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - 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(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 - } - - diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch index 1475bb1a51..7c73699b08 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch @@ -18,8 +18,8 @@ diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 0195555e..507136cb 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt -@@ -64,11 +64,18 @@ ${CMAKE_BINARY_DIR}/sql - ${CMAKE_SOURCE_DIR}/tpool +@@ -63,11 +63,18 @@ + ${CMAKE_BINARY_DIR}/sql ) -ADD_CUSTOM_COMMAND( @@ -41,7 +41,7 @@ index 0195555e..507136cb 100644 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) ENDIF() diff --git a/meta-oe/recipes-dbs/mysql/mariadb_11.4.6.bb b/meta-oe/recipes-dbs/mysql/mariadb_11.4.8.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_11.4.6.bb rename to meta-oe/recipes-dbs/mysql/mariadb_11.4.8.bb