Fix mysql scaling tests
Merge pull request #2952 from pmorie/fix-tests

Fix mysql scaling tests