mirror of
https://github.com/MariaDB/server.git
synced 2025-11-28 17:36:30 +03:00
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().