- some merge or something went wrong here

diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index b50d785183199a96fc83ea51082669055a33e21e..f1601bbc179eefb21185e9ac07e69ea230fce760 100644 (file)
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -15,6 +15,20 @@ from sqlalchemy.test.engines import utf8_engine
 import datetime
 from sqlalchemy.engine.url import make_url
 
+
+class CompileTest(TestBase, AssertsCompiledSQL):
+
+    __dialect__ = mysql.dialect()
+
+    def test_reserved_words(self):
+        table = Table("mysql_table", MetaData(),
+            Column("col1", Integer),
+            Column("master_ssl_verify_server_cert", Integer))
+        x = select([table.c.col1, table.c.master_ssl_verify_server_cert])
+
+        self.assert_compile(x, 
+            '''SELECT mysql_table.col1, mysql_table.`master_ssl_verify_server_cert` FROM mysql_table''')
+
 class DialectTest(TestBase):
     __only_on__ = 'mysql'
 
@@ -558,19 +572,6 @@ class TypesTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
         finally:
             meta.drop_all()
 
-class CompileTest(TestBase, AssertsCompiledSQL):
-
-    __dialect__ = mysql.dialect()
-
-    def test_reserved_words(self):
-        table = Table("mysql_table", MetaData(),
-            Column("col1", Integer),
-            Column("master_ssl_verify_server_cert", Integer))
-        x = select([table.c.col1, table.c.master_ssl_verify_server_cert])
-
-        self.assert_compile(x, 
-            '''SELECT mysql_table.col1, mysql_table.`master_ssl_verify_server_cert` FROM mysql_table''')
-
     def test_set(self):
         """Exercise the SET type."""