merge sae patch switch to mysql