[Maria-developers] Fixes for an issue with my_atomic