From patchwork Wed Oct 1 08:18:03 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: 71331 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 BE1B0CCA474 for ; Wed, 1 Oct 2025 08:18:30 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.11751.1759306701844803657 for ; Wed, 01 Oct 2025 01:18:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YGfQbSF3; spf=pass (domain: gmail.com, ip: 209.85.210.170, mailfrom: zboszor@gmail.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7811a02316bso4010817b3a.3 for ; Wed, 01 Oct 2025 01:18:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759306701; x=1759911501; 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=GXCiBGjH0QTF7ASvEp0qXE1GzwdbiCkZmAq7MaswGpU=; b=YGfQbSF37m1arv5k2/KNwk9o+acT1fHkxRMZHDbQjwXl/4KGt0GSWT57sQrEoFDtnC zFsHiM6vPXxKNIrh5H5E4GQ+hBGGEdKWrs/XRhfBZKQpQw+x01PbF9nBXX3fwyIO2dXI qK1fyWzLz45GVRngu0mzidRH7/Z+0+FxnPjIecUhiYlSd0AzlsQsEHf22SU8BWkZtP6g XFVdSHFoLn7YJ3wMxYESNQ6pl5wgxx12eI04ZwK1XikSVdPAo6H+S5D7c2ON1m66Gkp1 Db09lL5ewOJTFBRuufpTPJ9ITrG51Dx8I4cbCECCFWjd9F77fO4q4d7aZT1pkE6KhoRq RpzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759306701; x=1759911501; 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=GXCiBGjH0QTF7ASvEp0qXE1GzwdbiCkZmAq7MaswGpU=; b=INmnBIh2e01FvbxXeUCqziWsipIjE6p71p4lhTL0QLuThSqKWNo1TjxxERCgO0IJLP nuI3rJutDl14cL04HPGqcWkzMdlgRVMJQrurfena/2PfurRGaeIRfov0LgHLBOQ7iVnP 7TOhs1gg7AS4hNYHUokmvCWTr4HjmQBbq5vVThlgMVhEpGniq7QB4mZNQm0b47H+sTQ0 AGG2jlklPUuMaV9RTf2898EGsWuyj0oienWC4niZ9/iPpXPHL7pSqc8wbusQemmUhmeN xkwUTVSPGyl+3UdwWEyBLXd8sfLwZeNlRf0EK5IXtaXwE1RHNZzwQ6GYPti6gxELh81E U8/g== X-Gm-Message-State: AOJu0YyQrIDBqhSchvkcKIYpF7H5/cSmi5zAICSXXLaMwE9+MQsWdmuY S0L7Gd+KE39FE8oD73dwRDxQ/gO0SDQgeg9E2zNRlMoBBxHSzq69EDBLoxmq7yxP X-Gm-Gg: ASbGncuzKiytQkus24iwwK3H358RdH6EgeV5g+roIxeEbjkZC5W/QwnLZBNQDnjdgOr MdoMcg38vjlS7fJETKvXHkqczwEqzJ1607lKZsPzCxZVOSyBs4/rq+WDO5rkTeXEqMgP1LeC0Il ygTCpPwpeZVdBC5zrknfXRZLUbMDHhwPs6BtRuuLMIU3s8GyasegKeXuEGg2NVNnSEEsSLb7e7q shHNCK2qpE2IoWzL9BICeBbs5gURH7w8Twi2qMfK5tGyONOTEloGJvoIkL1iPOGRDj1mpMcdXqU VIK+CVc9MzWAkWJwIBrNCEtG4NlaGhUreNUvX36qTVR+i7LzsSTTGPRT0D7UrEIMRnz5xZIb1L6 +xEuaDR7Xj2VuTE/n2PU3/S8egiCsvUZj+cGvenBP7sKjRPwIYPpyv/1ETt6iQD5b0b+L X-Google-Smtp-Source: AGHT+IFJdoWTiZkBLJotBg43JR+8jaUJokJ+ncPr+Bx9ckDBwJ9cIFFFOuBse8GPFIAC2R87SpaaUQ== X-Received: by 2002:a05:6a00:929e:b0:781:15d0:8848 with SMTP id d2e1a72fcca58-78af3ffd90bmr2933743b3a.13.1759306700651; Wed, 01 Oct 2025 01:18:20 -0700 (PDT) Received: from fedora (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-78102c06af6sm15520381b3a.88.2025.10.01.01.18.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Oct 2025 01:18:20 -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 1/2] mariadb: Fix a crash in my_convert() Date: Wed, 1 Oct 2025 10:18:03 +0200 Message-ID: <20251001081804.422541-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 ; Wed, 01 Oct 2025 08:18:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/120091 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. 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 | 89 +++++++++++++++++++ 2 files changed, 90 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..26ba08865a --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-x86-specific-loop-in-my_convert.patch @@ -0,0 +1,89 @@ +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 + +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 Wed Oct 1 08:18:04 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: 71330 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 BD2BACCA470 for ; Wed, 1 Oct 2025 08:18:30 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.11753.1759306705202834232 for ; Wed, 01 Oct 2025 01:18:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XLckEzG3; spf=pass (domain: gmail.com, ip: 209.85.210.169, mailfrom: zboszor@gmail.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-7811a02316bso4010852b3a.3 for ; Wed, 01 Oct 2025 01:18:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1759306704; x=1759911504; 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=XLckEzG3XfSmEypt9JOE14vbj7Smiufkj5z8xk39AXrgZTj0LhDDkwHqsSKnBL6URn VOlcxDOhDOeV8a6LXxOagcePHwIweW8Ms/LjrcuqjjUAZ5+8uXuA6DsEXCNutethQDWo r/lCHug33388gqqWeolso5C8pLIM4ioeTrQKEAvgeqqJoNnHpjwjvIAQLbT7Jb4f0IbM 5S86UCPbPc3F36Cw6iOTtJEHP1nNjGPgmSuRA2R6He3Aetsc5nwlLv8k9f279r4p8rkZ ymI1YlDgHW45LePtCbDj5R4anqMcfCOnNqySj6UltztR2velefAaTfFoSxibDBASJCfk 1fEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759306704; x=1759911504; 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=AqlbErzo3fDRkzX6FXWzxIJhNHAXRDgokNMCbU+O5oghJyXjyqX9fZJbzQoTBFeZ5z jkUyM2v8uKXcq+4+aAxD4k9cwGjanWzT/VkJYHiDVwsP9jmqv8chQBBU9VLgFWlEEobU F1AgnT2yRa8DGDoemhvX5KqcLMBhm1m9r7T8Mojl2AwZE/AW1gWVS6nfEBdDL5dXaG2V sqpYBliRM09fhOu1/LkK23yeLJ8CAm8vZ9mxN7jlqUqCgA2T4kuwsEzemorqXMDog2kb jZF+N+CtZen2R/o1ocl6U9y5z/kklK0tW6wY9aULWy7hNogEoA04vSUwO/sFYi2l+RQQ 9YbQ== X-Gm-Message-State: AOJu0Yx/za5reQg1Njh7cBLQSAh/jqMyyX6rmJ//xaSVX2DNvV2HGOsy IJ1B70OZkbmA96K9pJzRtmEtJn3CprknLym8b0PRt5yz6MIDgGpmahCJ2UX5b+Cc X-Gm-Gg: ASbGnctyFsGVGYL7+wJB795tOnEhnEbXT2p9pNHvOPK4MNtmLW7XtOrZxTL/sEBzBxq EaC4LREpKisDOShfsTdEHTGnSNT6kfvPamZEIMCCLXXBbfMAeR/XhoQLPQVJTcB6+Xp4+XktZKk y4OzFpjlIomJcxGmwQMTpY4Bb0SNA9sL7tfo494C894tVRzvo8cKX9kdcLVcB5MzgCzZpPm6gsr bbuIkO/SgNjaD+9N+g77P9rJ3/OTAV94IxZumAfyX0ZUMJEnFdfgyNNhcuhrJ5YkaTy8yenuVJQ dUfsx1CmM1DR5DtevIF7ZUvYW80B3FgZ+NBvLn62rKa5uFs/N3N3QNFJrSxyBicu2fe2/Rb0C6I NuVXgDJaN5xmopMTaJ/K4Obe/JLJaUvc71VkPGCOuUwnWsCqdnaVpgifIIDI7A+QGX3eWlvBDtc PAk2Q= X-Google-Smtp-Source: AGHT+IGm5CxPE9CM+9tl8lUMqyx3+5WZF7I7Cusq9ygq8ekaP47PrlWQWGGFsSus4cRpt7AiWdI1OA== X-Received: by 2002:a05:6a00:8d3:b0:776:138a:ec97 with SMTP id d2e1a72fcca58-78af4176ab3mr2736642b3a.28.1759306704111; Wed, 01 Oct 2025 01:18:24 -0700 (PDT) Received: from fedora (dsl51B7D2F9.fixip.t-online.hu. [81.183.210.249]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-78102c06af6sm15520381b3a.88.2025.10.01.01.18.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Oct 2025 01:18:23 -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 2/2] mariadb: 11.4.8 Date: Wed, 1 Oct 2025 10:18:04 +0200 Message-ID: <20251001081804.422541-2-zboszor@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251001081804.422541-1-zboszor@gmail.com> References: <20251001081804.422541-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 ; Wed, 01 Oct 2025 08:18:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/120092 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