My sql simple skip name resolve fix

Fix for [PRD-1792] MySQL wants to reverse resolve
Rebased to current master.