Marko Mäkelä 77e8a311e1 Merge 10.4 into 10.5 ... A conflict between MDEV-19514 (b42294bc64) and MDEV-20934 (d7a2401750) was resolved. We will not invoke the function ibuf_delete_recs() from ibuf_merge_or_delete_for_page(). Instead, we will add that logic to the function ibuf_read_merge_pages().		2019-11-07 10:34:33 +02:00
..
dtrace
MacOSX
policy
rpm	Merge 10.4 into 10.5	2019-11-07 08:52:30 +01:00
binary-configure.sh
build-tags
ccfilter
CMakeLists.txt	Merge 10.3 into 10.4	2019-11-06 13:44:56 +02:00
compiler_warnings.supp
db.opt
magic
mariadb.pc.in
mariadb.service.in	Merge 10.3 into 10.4	2019-09-25 10:14:33 +03:00
mariadb@.service.in	Merge 10.3 into 10.4	2019-09-25 10:14:33 +03:00
mysql-log-rotate.sh
mysql-multi.server.sh
mysql.m4
mysql.server-sys5.sh
mysql.server.sh
mysqld_multi.server.sh
sysusers.conf.in
tmpfiles.conf.in
use_galera_new_cluster.conf
wsrep.cnf.sh
wsrep_notify.sh