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

Update FSF Address

2019-05-11 21:29:06 +03:00

MacOSX

Merge branch '5.5' into 10.1

2019-05-11 22:19:05 +03:00

policy

Merge 10.1 into 10.2

2019-02-02 11:40:02 +02:00

rpm

Merge 10.4 into 10.5

2019-11-07 08:52:30 +01:00

binary-configure.sh

…

build-tags

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

2017-07-04 15:31:25 +04:00

ccfilter

Fixed compiler warnings and test failures found by buildbot

2016-06-24 02:25:14 +03:00

CMakeLists.txt

Merge 10.3 into 10.4

2019-11-06 13:44:56 +02:00

compiler_warnings.supp

MDEV-18531 : Use WolfSSL instead of YaSSL as "bundled" SSL/encryption library

2019-05-22 13:48:25 +02:00

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

Merge remote-tracking branch 'origin/5.5' into 10.1

2019-09-24 11:18:39 +04:00

mysql-multi.server.sh

spelling fixes

2017-03-07 13:38:06 +04:00

mysql.m4

Update FSF Address

2019-05-11 21:29:06 +03:00

mysql.server-sys5.sh

…

mysql.server.sh

Merge branch '10.1' into 10.2

2019-07-26 07:03:39 +02:00

mysqld_multi.server.sh

MDEV-14900 Upstream 10.3 debian patches

2018-08-12 11:37:42 +02:00

sysusers.conf.in

Generate and install sysusers and tmpfiles configuration

2017-12-20 12:54:19 +02:00

tmpfiles.conf.in

Generate and install sysusers and tmpfiles configuration

2017-12-20 12:54:19 +02:00

use_galera_new_cluster.conf

MDEV-12646: systemd service file changes from Fedora

2019-09-20 08:59:18 +03:00

wsrep_notify.sh

…

wsrep.cnf.sh

MDEV-17428: Update wsrep_max_ws_rows and wsrep_max_ws_size values in wsrep.cnf.sh

2019-02-21 09:19:18 +02:00