I have attached the diff for MDEV-6838. Let me know your thoughts on it. The test case now fails without the patch and passes with the patch on both 5.5 and 10.0.

Sergey Petrunia is alright with the patch.

Regards,

Vicențiu