MDEV-36710: Revert "MDEV-33136: backport corrections from 10.11+"

[denis-protivensky]

• The Jira issue number for this PR is: MDEV-36710

Description

This reverts commit 0403f01. It caused MDEV-33136 test to fail in 10.6 branch.

Release Notes

This fix is ONLY for 10.6 branch.

How can this PR be tested?

MTR test case is made passing again.

Basing the PR against the correct MariaDB version

• This is a new feature or a refactoring, and the PR is based against the main branch.
• This is a bug fix, and the PR is based against the earliest maintained branch in which the bug can be reproduced.

PR quality check

• I checked the CODING_STANDARDS.md file and my PR conforms to this where appropriate.
• For any trivial modifications to the PR, I am ok with the reviewer making the changes themselves.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}