merged mainline default branch

diff --cc lib/sqlalchemy/connectors/mxodbc.py
index de9638151f91e513275736536c066f198f88cbeb,a646473fb74060d3f691c37fc2ae940a9bf3a71c..2374b4c95cf44b890ccc0652e5acf54b9a63ff1a
--- 1/lib/sqlalchemy/connectors/mxodbc.py
--- 2/lib/sqlalchemy/connectors/mxodbc.py
+++ b/lib/sqlalchemy/connectors/mxodbc.py
@@@ -29,16 -26,13 +29,15 @@@ class MxODBCConnector(Connector)
              raise ImportError, "Unrecognized platform for mxODBC import"
          return module
  
-     def visit_pool(self, pool):
-         def connect(conn, rec):
+     def on_connect(self):
+         def connect(conn):
              conn.stringformat = self.dbapi.MIXED_STRINGFORMAT
              conn.datetimeformat = self.dbapi.PYDATETIME_DATETIMEFORMAT
 +            conn.errorhandler = error_handler
 +            # Alternatives to experiment with:
              #conn.bindmethod = self.dbapi.BIND_USING_PYTHONTYPE
              #conn.bindmethod = self.dbapi.BIND_USING_SQLTYPE
- 
-         pool.add_listener({'connect':connect})
+         return connect
  
      def create_connect_args(self, url):
          """ Return a tuple of *args,**kwargs for creating a connection.