mysql mod: query -> qry, to avoid shadowing func
Merge pull request #5382 from hulu/mysql-query-shadowing

mysql mod: query -> qry, to avoid shadowing func