merged from main tip

diff --cc test/sql/test_query.py
index 7685d098507af2bf43b9366a62a6d040b4d18e32,3c9d5f0a75abc259c1f3b657bc5460023d70cc9e..96d0567a38e885b620f13582e6b32a14678a855d
--- 1/test/sql/test_query.py
--- 2/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@@ -1624,11 -1587,9 +1613,12 @@@ class OperatorTest(TestBase)
      @classmethod
      def teardown_class(cls):
          metadata.drop_all()
 -    
+     
 +
+     # TODO: seems like more tests warranted for this setup.
-     @testing.fails_on('maxdb', 'FIXME: unknown')
 +    @testing.crashes('mssql+mxodbc', """Invalid bind parameter placement:
 +         'SELECT flds.intcol % ? AS anon_1 \nFROM flds ORDER BY flds.idcol' (3,)
 +       """)
      def test_modulo(self):
          eq_(
              select([flds.c.intcol % 3],