Commit ddcd9179 authored by Jérome Perrin's avatar Jérome Perrin

component/mariadb: use 10.4 (and drop 10.3)

We use to stick with 10.3 because of crashes with ERP5, but with 10.4.28
we don't have crashes anymore.

See https://jira.mariadb.org/browse/MDEV-23939 for the upstream bug and
!817 for a
reproduction in ERP5.
parent c27c0cd7
...@@ -26,7 +26,7 @@ extends = ...@@ -26,7 +26,7 @@ extends =
parts = parts =
mariadb mariadb
[mariadb-10.4] [mariadb]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://archive.mariadb.org//mariadb-${:version}/source/mariadb-${:version}.tar.gz url = https://archive.mariadb.org//mariadb-${:version}/source/mariadb-${:version}.tar.gz
...@@ -131,21 +131,3 @@ environment = ...@@ -131,21 +131,3 @@ environment =
LDFLAGS=-L${groonga:location}/lib LDFLAGS=-L${groonga:location}/lib
PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig PKG_CONFIG_PATH=${groonga:location}/lib/pkgconfig:${groonga-normalizer-mysql:location}/lib/pkgconfig
### XXX keep using mariadb 10.3 because 10.4 causes crash
### (we just override here for easier revert)
[mariadb-10.3]
<= mariadb-10.4
version = 10.3.38
md5sum = 4cb91021431f514afbb1c1c2ab13944f
post-install =
ldd=`ldd %(location)s/lib/plugin/ha_rocksdb.so`
for x in ${lz4:location} ${snappy:location} ${zstd:location}
do echo "$ldd" |grep -qF " $x/lib/"
done
mkdir -p %(location)s/include/wsrep &&
cp -p wsrep/wsrep_api.h %(location)s/include/wsrep
[mariadb]
location = ${mariadb-10.3:location}
### /XXX keep using mariadb 10.3 because 10.4 causes crash
# To be extended after mariadb's buildout.cfg # To be extended after mariadb's buildout.cfg
[mariadb-10.4] [mariadb]
patches += patches +=
${:_profile_base_location_}/mdev20693.patch#34ca907d6b36ba81d75bed118243f637 ${:_profile_base_location_}/mdev20693.patch#34ca907d6b36ba81d75bed118243f637
[buildout]
extends = software.cfg
[mariadb]
location = ${mariadb-10.4:location}
...@@ -32,9 +32,6 @@ parts = ...@@ -32,9 +32,6 @@ parts =
caucase-eggs caucase-eggs
gowork gowork
[mariadb]
location = ${mariadb-10.4:location}
[template-mysqld-wrapper] [template-mysqld-wrapper]
recipe = slapos.recipe.template recipe = slapos.recipe.template
output = ${buildout:parts-directory}/${:_buildout_section_name_}/mysqld.in output = ${buildout:parts-directory}/${:_buildout_section_name_}/mysqld.in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment