diff mbox series

[meta-oe,scarthgap,v2,1/1] mariadb: upgrade 10.11.9 -> 10.11.12

Message ID 20250721094053.196062-1-yogita.urade@windriver.com
State New
Headers show
Series [meta-oe,scarthgap,v2,1/1] mariadb: upgrade 10.11.9 -> 10.11.12 | expand

Commit Message

yurade July 21, 2025, 9:40 a.m. UTC 
From: Yogita Urade <yogita.urade@windriver.com>

This upgrade includes fix for CVE-2023-52969, CVE-2023-52970
and CVE-2023-52971

Changelog:
https://mariadb.com/kb/en/mariadb-10-11-12-changelog/

refresh 0001-Add-missing-includes-cstdint-and-cstdio.patch

Droped mm_malloc.patch and ppc-remove-glibc-dep.patch (Commit ID:
https://github.com/MariaDB/server/commit/dff354e7df2fa774ce4da77202a17e2cae99ac59)
as these changes are available in 10.11.12

Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
---
 ..._10.11.9.bb => mariadb-native_10.11.12.bb} |  0
 meta-oe/recipes-dbs/mysql/mariadb.inc         |  4 +-
 ...-missing-includes-cstdint-and-cstdio.patch | 43 +++++++------------
 .../recipes-dbs/mysql/mariadb/mm_malloc.patch | 13 ------
 .../mysql/mariadb/ppc-remove-glibc-dep.patch  | 43 -------------------
 ...mariadb_10.11.9.bb => mariadb_10.11.12.bb} |  0
 6 files changed, 16 insertions(+), 87 deletions(-)
 rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.9.bb => mariadb-native_10.11.12.bb} (100%)
 delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch
 delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch
 rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.9.bb => mariadb_10.11.12.bb} (100%)

Comments

Wang, Jinfeng (CN) Sept. 24, 2025, 7:19 a.m. UTC | #1 
With this patch, I failed to start mysqld with systemctl. The errors are 
bellows:
    root@qemux86-64:~# systemctl start mysqld
    Job for mysqld.service failed because a timeout was exceeded.
    See "systemctl status mysqld.service" and "journalctl -xeu 
mysqld.service" for details.
    root@qemux86-64:~# cat /var/log/mysqld.log
    ERROR: 1436  Thread stack overrun:  8380392 bytes used of a 299008 
byte stack, and 32000 bytes needed. Consider increasing the thread_stack 
system variable.
    2025-09-24  6:56:07 0 [ERROR] Aborting
    250924 06:56:31 mysqld_safe Starting mariadbd daemon with databases 
from /var/lib/mysql
    2025-09-24  6:56:33 0 [Note] Starting MariaDB 10.11.12-MariaDB 
source revision cafd22db7970ce081bafd887359aa0a77cfb769d server_uid 
Z7CcUMa7l6MwVomwugQ7SNTawWM= as pr7
    2025-09-24  6:56:34 0 [Note] Plugin 'FEEDBACK' is disabled.
    2025-09-24  6:56:34 0 [ERROR] Could not open mysql.plugin table: 
"Thread stack overrun:  8366424 bytes used of a 299008 byte stack, and 
81920 bytes needed. Consider d
    2025-09-24  6:56:34 0 [ERROR] Can't open and lock privilege tables: 
Thread stack overrun:  8367720 bytes used of a 299008 byte stack, and 
81920 bytes needed. Conside.
    2025-09-24  6:56:34 0 [ERROR] Fatal error: Can't open and lock 
privilege tables: Thread stack overrun:  8347032 bytes used of a 299008 
byte stack, and 81920 bytes ne.
    2025-09-24  6:56:34 0 [ERROR] Aborting
    250924 06:56:34 mysqld_safe mysqld from pid file 
/var/lib/mysql/mysqld.pid ended

After I added one line thread_stack = 16M in /etc/my.cnf , it is ok to 
start mysqld.


Thanks.

Jinfeng

On 7/21/25 17:40, Urade, Yogita via lists.openembedded.org wrote:
> From: Yogita Urade <yogita.urade@windriver.com>
>
> This upgrade includes fix for CVE-2023-52969, CVE-2023-52970
> and CVE-2023-52971
>
> Changelog:
> https://mariadb.com/kb/en/mariadb-10-11-12-changelog/
>
> refresh 0001-Add-missing-includes-cstdint-and-cstdio.patch
>
> Droped mm_malloc.patch and ppc-remove-glibc-dep.patch (Commit ID:
> https://github.com/MariaDB/server/commit/dff354e7df2fa774ce4da77202a17e2cae99ac59)
> as these changes are available in 10.11.12
>
> Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
> ---
>   ..._10.11.9.bb => mariadb-native_10.11.12.bb} |  0
>   meta-oe/recipes-dbs/mysql/mariadb.inc         |  4 +-
>   ...-missing-includes-cstdint-and-cstdio.patch | 43 +++++++------------
>   .../recipes-dbs/mysql/mariadb/mm_malloc.patch | 13 ------
>   .../mysql/mariadb/ppc-remove-glibc-dep.patch  | 43 -------------------
>   ...mariadb_10.11.9.bb => mariadb_10.11.12.bb} |  0
>   6 files changed, 16 insertions(+), 87 deletions(-)
>   rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.9.bb => mariadb-native_10.11.12.bb} (100%)
>   delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch
>   delete mode 100644 meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch
>   rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.9.bb => mariadb_10.11.12.bb} (100%)
>
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.12.bb
> similarity index 100%
> rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb
> rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.12.bb
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
> index f52947f359..83a3a1cafd 100644
> --- a/meta-oe/recipes-dbs/mysql/mariadb.inc
> +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
> @@ -17,15 +17,13 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
>              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://mm_malloc.patch \
>              file://sys_futex.patch \
>              file://cross-compiling.patch \
>              file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
>              file://lfs64.patch \
>              file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
>             "
> -SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
> -SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20"
> +SRC_URI[sha256sum] = "d61f23090cfc14f43e8a27c2d3ce7f80247e74481bb26a2d3a6308b8d194e167"
>   
>   UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
>   
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
> index f8ccb998be..fa580d039a 100644
> --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
> +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
> @@ -11,27 +11,14 @@ Upstream-Status: Pending
>   Signed-off-by: Khem Raj <raj.khem@gmail.com>
>   Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
>   ---
> - .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h   | 1 +
> - storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h   | 1 +
> - .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h    | 1 +
> - storage/rocksdb/rocksdb/util/slice.cc                            | 1 +
> - storage/rocksdb/rocksdb/util/string_util.h                       | 1 +
> - 5 files changed, 5 insertions(+)
> + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h  | 1 +
> + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h   | 1 +
> + storage/rocksdb/rocksdb/util/slice.cc                           | 2 +-
> + storage/rocksdb/rocksdb/util/string_util.h                      | 1 +
> + 4 files changed, 4 insertions(+), 1 deletion(-)
>   
> -diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
> -index 963c1d8e..73487edd 100644
> ---- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
> -+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
> -@@ -5,6 +5,7 @@
> -
> - #pragma once
> -
> -+#include <cstdint>
> - #include "rocksdb/rocksdb_namespace.h"
> -
> - struct CompactionIterationStats {
>   diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
> -index c7f93b4c..3c2ab805 100644
> +index 7fb9d489..f7b4e6f0 100644
>   --- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
>   +++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
>   @@ -8,6 +8,7 @@
> @@ -55,20 +42,20 @@ index f356395f..32152217 100644
>    #include <vector>
>    
>   diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc
> -index 6db11cc9..c26b6a21 100644
> +index 3c3656de..b18d7f5d 100644
>   --- a/storage/rocksdb/rocksdb/util/slice.cc
>   +++ b/storage/rocksdb/rocksdb/util/slice.cc
> -@@ -8,6 +8,7 @@
> - // found in the LICENSE file. See the AUTHORS file for names of contributors.
> +@@ -12,7 +12,7 @@
> + #include <stdio.h>
>    
>    #include <algorithm>
> +-
>   +#include <cstdint>
> + #include "rocksdb/convenience.h"
>    #include "rocksdb/slice_transform.h"
> - #include "rocksdb/slice.h"
> - #include "util/string_util.h"
> -
> -diff --git a/util/string_util.h b/util/string_util.h
> -index 55d106fff02..11178fd1d7b 100644
> + #include "rocksdb/utilities/object_registry.h"
> +diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h
> +index 7794dbb0..b480177e 100644
>   --- a/storage/rocksdb/rocksdb/util/string_util.h
>   +++ b/storage/rocksdb/rocksdb/util/string_util.h
>   @@ -6,6 +6,7 @@
> @@ -80,5 +67,5 @@ index 55d106fff02..11178fd1d7b 100644
>    #include <string>
>    #include <unordered_map>
>   --
> -2.25.1
> +2.40.0
>   
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch b/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch
> deleted file mode 100644
> index 6aa6c84882..0000000000
> --- a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -Upstream-Status: Pending
> -
> ---- a/storage/rocksdb/rocksdb/port/jemalloc_helper.h
> -+++ b/storage/rocksdb/rocksdb/port/jemalloc_helper.h
> -@@ -5,7 +5,7 @@
> -
> - #pragma once
> -
> --#if defined(__clang__)
> -+#if defined(__clang__) && defined(__GLIBC__)
> - // glibc's `posix_memalign()` declaration specifies `throw()` while clang's
> - // declaration does not. There is a hack in clang to make its re-declaration
> - // compatible with glibc's if they are declared consecutively. That hack breaks
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch
> deleted file mode 100644
> index 3787b74ad1..0000000000
> --- a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -Upstream-Status: Pending
> -
> -Remove glibc specific function dependencies
> -
> -Sourced from: https://git.alpinelinux.org/aports/tree/main/mariadb/ppc-remove-glibc-dep.patch
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -
> -diff --git a/include/my_cpu.h b/include/my_cpu.h
> -index f2e26fca..94599b74 100644
> ---- a/include/my_cpu.h
> -+++ b/include/my_cpu.h
> -@@ -24,17 +24,16 @@
> - */
> -
> - #ifdef _ARCH_PWR8
> --#include <sys/platform/ppc.h>
> - /* Very low priority */
> --#define HMT_very_low() __ppc_set_ppr_very_low()
> -+#define HMT_very_low() asm volatile("or 31,31,31")
> - /* Low priority */
> --#define HMT_low() __ppc_set_ppr_low()
> -+#define HMT_low() asm volatile ("or 1,1,1")
> - /* Medium low priority */
> --#define HMT_medium_low() __ppc_set_ppr_med_low()
> -+#define HMT_medium_low() asm volatile ("or 6,6,6")
> - /* Medium priority */
> --#define HMT_medium() __ppc_set_ppr_med()
> -+#define HMT_medium() asm volatile ("or 2,2,2")
> - /* Medium high priority */
> --#define HMT_medium_high() __ppc_set_ppr_med_high()
> -+#define HMT_medium_high() asm volatile("or 5,5,5")
> - /* High priority */
> - #define HMT_high() asm volatile("or 3,3,3")
> - #else
> -@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
> -   __asm__ __volatile__ ("pause");
> - #endif
> - #elif defined(_ARCH_PWR8)
> --  __ppc_get_timebase();
> -+  __builtin_ppc_get_timebase();
> - #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
> -   /* Mainly, prevent the compiler from optimizing away delay loops */
> -   __asm__ __volatile__ ("":::"memory");
> diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.12.bb
> similarity index 100%
> rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb
> rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.12.bb
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#118655): https://lists.openembedded.org/g/openembedded-devel/message/118655
> Mute This Topic: https://lists.openembedded.org/mt/114265400/8617462
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [Jinfeng.Wang.CN@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.12.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb
rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.12.bb
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index f52947f359..83a3a1cafd 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -17,15 +17,13 @@  SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
            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://mm_malloc.patch \
            file://sys_futex.patch \
            file://cross-compiling.patch \
            file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
            file://lfs64.patch \
            file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
           "
-SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
-SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20"
+SRC_URI[sha256sum] = "d61f23090cfc14f43e8a27c2d3ce7f80247e74481bb26a2d3a6308b8d194e167"
 
 UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"
 
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
index f8ccb998be..fa580d039a 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch
@@ -11,27 +11,14 @@  Upstream-Status: Pending
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 ---
- .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h   | 1 +
- storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h   | 1 +
- .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h    | 1 +
- storage/rocksdb/rocksdb/util/slice.cc                            | 1 +
- storage/rocksdb/rocksdb/util/string_util.h                       | 1 +
- 5 files changed, 5 insertions(+)
+ storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h  | 1 +
+ .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h   | 1 +
+ storage/rocksdb/rocksdb/util/slice.cc                           | 2 +-
+ storage/rocksdb/rocksdb/util/string_util.h                      | 1 +
+ 4 files changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-index 963c1d8e..73487edd 100644
---- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
-@@ -5,6 +5,7 @@
- 
- #pragma once
- 
-+#include <cstdint>
- #include "rocksdb/rocksdb_namespace.h"
- 
- struct CompactionIterationStats {
 diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
-index c7f93b4c..3c2ab805 100644
+index 7fb9d489..f7b4e6f0 100644
 --- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
 +++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
 @@ -8,6 +8,7 @@
@@ -55,20 +42,20 @@  index f356395f..32152217 100644
  #include <vector>
  
 diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc
-index 6db11cc9..c26b6a21 100644
+index 3c3656de..b18d7f5d 100644
 --- a/storage/rocksdb/rocksdb/util/slice.cc
 +++ b/storage/rocksdb/rocksdb/util/slice.cc
-@@ -8,6 +8,7 @@
- // found in the LICENSE file. See the AUTHORS file for names of contributors.
+@@ -12,7 +12,7 @@
+ #include <stdio.h>
  
  #include <algorithm>
+-
 +#include <cstdint>
+ #include "rocksdb/convenience.h"
  #include "rocksdb/slice_transform.h"
- #include "rocksdb/slice.h"
- #include "util/string_util.h"
-
-diff --git a/util/string_util.h b/util/string_util.h
-index 55d106fff02..11178fd1d7b 100644
+ #include "rocksdb/utilities/object_registry.h"
+diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h
+index 7794dbb0..b480177e 100644
 --- a/storage/rocksdb/rocksdb/util/string_util.h
 +++ b/storage/rocksdb/rocksdb/util/string_util.h
 @@ -6,6 +6,7 @@
@@ -80,5 +67,5 @@  index 55d106fff02..11178fd1d7b 100644
  #include <string>
  #include <unordered_map>
 -- 
-2.25.1
+2.40.0
 
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch b/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch
deleted file mode 100644
index 6aa6c84882..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/mm_malloc.patch
+++ /dev/null
@@ -1,13 +0,0 @@ 
-Upstream-Status: Pending
-
---- a/storage/rocksdb/rocksdb/port/jemalloc_helper.h
-+++ b/storage/rocksdb/rocksdb/port/jemalloc_helper.h
-@@ -5,7 +5,7 @@
- 
- #pragma once
- 
--#if defined(__clang__)
-+#if defined(__clang__) && defined(__GLIBC__)
- // glibc's `posix_memalign()` declaration specifies `throw()` while clang's
- // declaration does not. There is a hack in clang to make its re-declaration
- // compatible with glibc's if they are declared consecutively. That hack breaks
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch b/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch
deleted file mode 100644
index 3787b74ad1..0000000000
--- a/meta-oe/recipes-dbs/mysql/mariadb/ppc-remove-glibc-dep.patch
+++ /dev/null
@@ -1,43 +0,0 @@ 
-Upstream-Status: Pending
-
-Remove glibc specific function dependencies
-
-Sourced from: https://git.alpinelinux.org/aports/tree/main/mariadb/ppc-remove-glibc-dep.patch
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-diff --git a/include/my_cpu.h b/include/my_cpu.h
-index f2e26fca..94599b74 100644
---- a/include/my_cpu.h
-+++ b/include/my_cpu.h
-@@ -24,17 +24,16 @@
- */
-
- #ifdef _ARCH_PWR8
--#include <sys/platform/ppc.h>
- /* Very low priority */
--#define HMT_very_low() __ppc_set_ppr_very_low()
-+#define HMT_very_low() asm volatile("or 31,31,31")
- /* Low priority */
--#define HMT_low() __ppc_set_ppr_low()
-+#define HMT_low() asm volatile ("or 1,1,1")
- /* Medium low priority */
--#define HMT_medium_low() __ppc_set_ppr_med_low()
-+#define HMT_medium_low() asm volatile ("or 6,6,6")
- /* Medium priority */
--#define HMT_medium() __ppc_set_ppr_med()
-+#define HMT_medium() asm volatile ("or 2,2,2")
- /* Medium high priority */
--#define HMT_medium_high() __ppc_set_ppr_med_high()
-+#define HMT_medium_high() asm volatile("or 5,5,5")
- /* High priority */
- #define HMT_high() asm volatile("or 3,3,3")
- #else
-@@ -72,7 +71,7 @@ static inline void MY_RELAX_CPU(void)
-   __asm__ __volatile__ ("pause");
- #endif
- #elif defined(_ARCH_PWR8)
--  __ppc_get_timebase();
-+  __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
-   /* Mainly, prevent the compiler from optimizing away delay loops */
-   __asm__ __volatile__ ("":::"memory");
diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.12.bb
similarity index 100%
rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb
rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.12.bb