revision-id: 98922dabb74bb05cd97003e4a0c5f3b2a878ccf0 (mariadb-10.4.27-70-g98922da) parent(s): c8f9bb2718c4ed7b464504c54df961bfeb2cccca c8f2e9a5c0ac5905f28b050b7df5a9ffd914b7e7 author: Igor Babaev committer: Igor Babaev timestamp: 2023-01-30 21:02:35 -0800 message: Merge branch 'bb-10.4-release' of github.com:MariaDB/server into bb-10.4-release # Conflicts: # sql/sql_select.cc .../r/binlog_recovery_after_checksum_change.result | 8 ---- .../binlog/r/innodb_rc_insert_before_delete.result | 52 ++++++++++++++++++++++ sql/sql_select.cc | 8 ++-- 3 files changed, 57 insertions(+), 11 deletions(-)