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

..

include

Merge 10.4 into 10.5

2019-09-06 17:16:40 +03:00

r

Merge 10.4 into 10.5

2019-11-07 10:34:33 +02:00

t

Merge 10.4 into 10.5

2019-11-07 10:34:33 +02:00

disabled.def

MDEV-7635: Part 1

2017-02-10 06:30:42 -05:00