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

[denis-protivensky]

trafficstars

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

Description

This reverts commit 0403f0147f176190b6a2ca61996c12eada275e4c. 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.
• [x] 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

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