ACT-1890: Multi tenancy support: QA fix for mysql (can’t target table in from clause)