* mysql_query: simple refactoring of query type check * do the same for mysql_user * Improve integration test coverage