Merge remote-tracking branch 'nexedi/feat/mariadb-10.11' into zope4py3

component/mariadb/buildout.cfg

@@ -4,6 +4,7 @@
 [buildout]
 extends =
   ../binutils/buildout.cfg
+  ../bison/buildout.cfg
   ../bzip2/buildout.cfg
   ../cmake/buildout.cfg
   ../groonga/buildout.cfg
@@ -11,10 +12,12 @@ extends =
   ../libaio/buildout.cfg
   ../libxml2/buildout.cfg
   ../lz4/buildout.cfg
+  ../m4/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
   ../patch/buildout.cfg
   ../pcre/buildout.cfg
+  ../pcre2/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../readline/buildout.cfg
   ../snappy/buildout.cfg
@@ -26,12 +29,11 @@ extends =
 parts =
   mariadb
 
-[mariadb]
+[mariadb-common]
 recipe = slapos.recipe.cmmi
 shared = true
 url = https://archive.mariadb.org//mariadb-${:version}/source/mariadb-${:version}.tar.gz
-version = 10.4.28
-md5sum = d098e9af77a26260a6a6c21a7ed0daf6
+pcre-location = ${pcre2:location}
 pre-configure =
   set '\bSET(PLUGIN_AUTH_PAM YES CACHE BOOL "")' cmake/build_configurations/mysql_release.cmake
   grep -q "$@"
@@ -73,17 +75,14 @@ configure-options =
 #  https://lore.kernel.org/linux-btrfs/ed3642c2-682e-08a1-f18d-2d63409b7631@nexedi.com/T/
   -DWITH_FALLOCATE=NO
 ##
-CMAKE_CFLAGS = -I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${pcre:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
-CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${pcre:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib
+CMAKE_CFLAGS = -I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${:pcre-location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${lz4:location}/include -I${snappy:location}/include -I${zstd:location}/include
+CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${:pcre-location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${lz4:location}/lib:${snappy:location}/lib:${zstd:location}/lib
 environment =
   CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${pcre:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${lz4:location}/include:${snappy:location}/include:${zstd:location}/include
+  CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${:pcre-location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${lz4:location}/include:${snappy:location}/include:${zstd:location}/include
   CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
-  LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${libaio:location}/lib -L${pcre:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib -L${unixodbc:location}/lib -L${lz4:location}/lib -L${snappy:location}/lib -L${zstd:location}/lib
-  PATH=${patch:location}/bin:%(PATH)s
-patch-options = -p1
-patches =
-  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.34-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
+  LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${libaio:location}/lib -L${:pcre-location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib -L${unixodbc:location}/lib -L${lz4:location}/lib -L${snappy:location}/lib -L${zstd:location}/lib
+  PATH=${bison:location}/bin:${m4:location}/bin:${patch:location}/bin:%(PATH)s
 post-install =
   ldd=`ldd %(location)s/lib/plugin/ha_rocksdb.so`
   for x in ${lz4:location} ${snappy:location} ${zstd:location}
@@ -92,6 +91,34 @@ post-install =
   set -- wsrep-lib/wsrep-API/*/wsrep_api.h
   install -DpT $1 %(location)s/$1
   cp -a wsrep-lib/include %(location)s/wsrep-lib
+  cp -a storage/perfschema/libperfschema.a %(location)s/lib
+
+[mariadb-10.4]
+<= mariadb-common
+version = 10.4.31
+md5sum = 7de92260770736c84d8f94e31c105233
+pcre-location = ${pcre:location}
+patch-options = -p1
+patches =
+  https://sources.debian.org/data/main/m/mariadb-10.3/1:10.3.34-0+deb10u1/debian/patches/0024-Revert-to-using-system-pcre-library.patch#1c6a0f2634f5a56122299674b77b1131
+
+[mariadb-10.5]
+<= mariadb-common
+version = 10.5.22
+md5sum = a492aa334f1111513b049e89b15b40d8
+
+[mariadb-10.6]
+<= mariadb-common
+version = 10.6.15
+md5sum = 6b34c051000ecd352a59f8094c84c5c2
+
+[mariadb-10.11]
+<= mariadb-common
+version = 10.11.5
+md5sum = 9a4396dea3a7d3009db6ea962cac0eb6
+
+[mariadb]
+<= mariadb-10.11
 
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.

software/neoppod/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = fda911d5ef9efee365f1b0ff9843a50b
 
 [template-neo-my-cnf]
 filename = my.cnf.in
-md5sum = 3ae93702f3890a504cc8a93eb5ad52bc
+md5sum = 44928b3e8abd71c4966178036bab352e
 
 [template-neo]
 filename = instance.cfg.in

software/neoppod/my.cnf.in

@@ -34,7 +34,7 @@ plugin-load = {{ ';'.join(plugins) }}
 
 max_allowed_packet = 128M
 query_cache_size = 32M
-innodb_locks_unsafe_for_binlog = 1
+transaction-isolation = READ-COMMITTED
 
 # Some dangerous settings you may want to uncomment temporarily
 # if you only want performance or less disk access.

stack/erp5-zope2/buildout.hash.cfg

@@ -42,7 +42,7 @@ md5sum = 43556e5bca8336dd543ae8068512aa6d
 
 [template-my-cnf]
 filename = my.cnf.in
-md5sum = 2c553103f1196f95e4b6d0716a1e0638
+md5sum = 032fb3f3760ae3f2a0172a23e6d01368
 
 [template-mariadb-initial-setup]
 filename = mariadb_initial_setup.sql.in

stack/erp5-zope2/my.cnf.in

@@ -48,7 +48,7 @@ max_connections = {{ parameter_dict['max-connection-count'] }}
 # very important to allow parallel indexing
 # Note: this is compatible with binlog-based incremental backups, because ERP5
 # doesn't use "insert ... select" (in any number of queries) pattern.
-innodb_locks_unsafe_for_binlog = 1
+transaction-isolation = READ-COMMITTED
 
 # disable innodb_change_buffering to prevent potential risk of crash or data corruption,
 # that is default from 10.5.14.

stack/erp5/buildout.hash.cfg

@@ -42,7 +42,7 @@ md5sum = f45dc4568b63de39f49b8fecca5deef1
 
 [template-my-cnf]
 filename = my.cnf.in
-md5sum = 99ad97bb28638c35054b10ff65bcc437
+md5sum = 71d02dc036c6d46ae30d19303ac7b5f9
 
 [template-mariadb-initial-setup]
 filename = mariadb_initial_setup.sql.in

stack/erp5/my.cnf.in

@@ -48,7 +48,7 @@ max_connections = {{ parameter_dict['max-connection-count'] }}
 # very important to allow parallel indexing
 # Note: this is compatible with binlog-based incremental backups, because ERP5
 # doesn't use "insert ... select" (in any number of queries) pattern.
-innodb_locks_unsafe_for_binlog = 1
+transaction-isolation = READ-COMMITTED
 
 # disable innodb_change_buffering to prevent potential risk of crash or data corruption,
 # that is default from 10.5.14.