[m] Updated full sql to match [r2420]