runtests.py: use except-as syntax
mysql mod: query -> qry, to avoid shadowing func
rm unnecessary parens around 'del'; it's not a function
Merge pull request #5380 from cvrebert/patch-1

runtests.py: use except-as syntax
Merge pull request #5382 from hulu/mysql-query-shadowing

mysql mod: query -> qry, to avoid shadowing func
Merge pull request #5385 from hulu/del-is-not-a-func

rm unnecessary parens around 'del'; it's not a function