CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mariadb: Upgrade to 10.11.6

Browse Source 
Remove one patch as the logic is included in the new version [1] [2].

Upgrade mariadb to 10.11.6 [3].

[1] f4cec369a3
[2] cd5808eb8d
[3] https://mariadb.com/kb/en/mariadb-10-11-6-release-notes/

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 702cf1dc11)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Mingli Yu 2023-12-14 18:13:49 +08:00 committed by Armin Kuster
parent 732522fc1f
commit 5c88ef0935
4 changed files with 1 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
meta-oe/recipes-dbs/mysql/mariadb-native_10.11.5.bb → meta-oe/recipes-dbs/mysql/mariadb-native_10.11.6.bb
View File

3
meta-oe/recipes-dbs/mysql/mariadb.inc
View File

@ -23,10 +23,9 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \
file://lfs64.patch \
file://0001-Add-missing-includes-cstdint-and-cstdio.patch \
file://libfmt_make_fmt.patch \
"
SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch"
SRC_URI[sha256sum] = "4c9484048d4d0c71dd076ab33fc2a9ce8510bdf762886de0d63fe52496f3dbbb"
SRC_URI[sha256sum] = "1c0163463e98d71f4780741611a40981eee2bc44d392601ca49bbf948d04dd67"
UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases"

68
meta-oe/recipes-dbs/mysql/mariadb/libfmt_make_fmt.patch
View File

@ -1,68 +0,0 @@
Make make_arg work with libfmt 10.1+
This ensures that compiler can find the correct template to use
Fixes
mariadb-10.11.5/sql/item_strfunc.cc:1429:22: error: no matching functi
on for call to 'make_arg'
| 1429 | vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_int());
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~
| /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/mariadb/10.11.5/recipe-sysroot/usr/include/fmt/core.h:1588:20: note: candidate functio
n [with Context = fmt::basic_format_context<fmt::appender, char>, T = long long] not viable: expects an lvalue for 1st argument
| 1588 | FMT_CONSTEXPR auto make_arg(T& val) -> basic_format_arg<Context> {
| | ^ ~~~~~~
| /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/mariadb/10.11.5/recipe-sysroot/usr/include/fmt/core.h:1559:31: note: candidate templat
e ignored: invalid explicitly-specified argument for template parameter 'PACKED'
| 1559 | FMT_CONSTEXPR FMT_INLINE auto make_arg(T& [ 46%] Building C object mysys/CMakeFiles/mysys.dir/my_likely.c.o
| val) -> value<Context> {
| | ^
| /mnt/b/yoe/master/build/tmp/work/cortexa72-cortexa53-crypto-yoe-linux/mariadb/10.11.5/recipe-sysroot/usr/include/fmt/core.h:1596:27: note: candidate templat
e ignored: invalid explicitly-specified argument for template parameter 'PACKED'
| 1596 | FMT_CONSTEXPR inline auto make_arg(T& val) -> basic_format_arg<Context> {
| | ^
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/cmake/libfmt.cmake
+++ b/cmake/libfmt.cmake
@@ -33,8 +33,9 @@ MACRO (CHECK_LIBFMT)
#include <fmt/format-inl.h>
#include <iostream>
int main() {
+ int val = 42;
fmt::format_args::format_arg arg=
- fmt::detail::make_arg<fmt::format_context>(42);
+ fmt::detail::make_arg<fmt::format_context>(val);
std::cout << fmt::vformat(\"The answer is {}.\",
fmt::format_args(&arg, 1));
}" HAVE_SYSTEM_LIBFMT)
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1426,14 +1426,22 @@ String *Item_func_sformat::val_str(Strin
switch (args[carg]->result_type())
{
case INT_RESULT:
- vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_int());
+ int intval;
+ intval = args[carg]->val_int();
+ vargs[carg-1]= fmt::detail::make_arg<ctx>(intval);
break;
case DECIMAL_RESULT: // TODO
case REAL_RESULT:
+ float fval;
+ int val;
if (args[carg]->field_type() == MYSQL_TYPE_FLOAT)
- vargs[carg-1]= fmt::detail::make_arg<ctx>((float)args[carg]->val_real());
- else
- vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_real());
+ {
+ fval = (float)args[carg]->val_real();
+ vargs[carg-1]= fmt::detail::make_arg<ctx>(fval);
+ } else {
+ val = args[carg]->val_real();
+ vargs[carg-1]= fmt::detail::make_arg<ctx>(val);
+ }
break;
case STRING_RESULT:
if (!(parg= args[carg]->val_str(&val_arg[carg-1])))

0
meta-oe/recipes-dbs/mysql/mariadb_10.11.5.bb → meta-oe/recipes-dbs/mysql/mariadb_10.11.6.bb
View File