diff --git a/MySQLdb/MySQLdb/__init__.py b/MySQLdb/MySQLdb/__init__.py index 943c42a..7808b91 100644 --- a/MySQLdb/MySQLdb/__init__.py +++ b/MySQLdb/MySQLdb/__init__.py @@ -18,7 +18,7 @@ __revision__ = """$Revision$"""[11:-2] version_info = ( 1, 1, - 3, + 4, "final", 1) if version_info[3] == "final": __version__ = "%d.%d.%d" % version_info[:3] diff --git a/MySQLdb/MySQLdb/connections.py b/MySQLdb/MySQLdb/connections.py index 9c90786..03646de 100644 --- a/MySQLdb/MySQLdb/connections.py +++ b/MySQLdb/MySQLdb/connections.py @@ -115,7 +115,7 @@ class Connection(_mysql.connection): flag = flag == True s = super(Connection, self) if hasattr(s, 'autocommit'): - s.autocommit(self, flag) + s.autocommit(flag) else: self.query("SET AUTOCOMMIT=%d" % flag) diff --git a/MySQLdb/_mysql.c b/MySQLdb/_mysql.c index 4561117..ae7c611 100644 --- a/MySQLdb/_mysql.c +++ b/MySQLdb/_mysql.c @@ -1,5 +1,5 @@ -#define version_info "(1,1,3,'final',1)" -#define __version__ "1.1.3" +#define version_info "(1,1,4,'final',1)" +#define __version__ "1.1.4" /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/MySQLdb/setup.py b/MySQLdb/setup.py index c690dce..3ca2c8f 100644 --- a/MySQLdb/setup.py +++ b/MySQLdb/setup.py @@ -18,18 +18,20 @@ embedded_server = (mysqlclient == 'mysqld') name = "MySQL-%s" % os.path.basename(sys.executable) if embedded_server: name = name + "-embedded" -version = "1.1.3" +version = "1.1.4" # include files and library locations should cover most platforms include_dirs = [ - '/usr/include/mysql', '/usr/local/include/mysql', + '/usr/local/include/mysql', '/usr/local/mysql/include', '/usr/local/mysql/include/mysql' + '/usr/include/mysql', ] library_dirs = [ - '/usr/lib/mysql', '/usr/local/lib/mysql', + '/usr/local/lib/mysql', '/usr/local/mysql/lib', - '/usr/local/mysql/lib/mysql' + '/usr/local/mysql/lib/mysql', + '/usr/lib/mysql', ] libraries = [mysqlclient] + mysqloptlibs