Merge in changes from the trunk

MySQLdb/MySQLdb/__init__.py

@@ -17,8 +17,8 @@ __author__ = "Andy Dustman <andy@dustman.net>"
 __revision__ = """$Revision$"""[11:-2]
 version_info = (
     1,
-    1,
-    10,
+    2,
+    0,
     "final",
     1)
 if version_info[3] == "final": __version__ = "%d.%d.%d" % version_info[:3]

MySQLdb/MySQLdb/converters.py

@@ -147,3 +147,10 @@ try:
     conversions[FIELD_TYPE.DECIMAL] = Decimal
 except ImportError:
     pass
+
+try:
+    from types import BooleanType
+    def Bool2Str(s, d): return str(int(s))
+    conversions[BooleanType] = Bool2Str
+except ImportError:
+    pass

MySQLdb/README

@@ -128,8 +128,8 @@ or you want to use the embedded server (mysqld).
 
 Finally, putting it together::
 
-  $ tar xfz MySQL-python-1.1.10.tar.gz
-  $ cd MySQL-python-1.1.10
+  $ tar xfz MySQL-python-1.2.0.tar.gz
+  $ cd MySQL-python-1.2.0
   $ python setup.py build
   $ su # or use sudo
   # python setup.py install

MySQLdb/_mysql.c

@@ -1,5 +1,5 @@
-#define version_info "(1,1,10,'final',1)"
-#define __version__ "1.1.10"
+#define version_info "(1,2,0,'final',1)"
+#define __version__ "1.2.0"
 /*
 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

MySQLdb/setup.py

@@ -37,7 +37,7 @@ embedded_server = (mysqlclient == 'mysqld')
 name = "MySQL-%s" % os.path.basename(sys.executable)
 if embedded_server:
     name = name + "-embedded"
-version = "1.1.10"
+version = "1.2.0"
 
 extra_objects = []
 
@@ -62,9 +62,12 @@ else:
     
     def config(what):
         from os import popen
-        return popen("mysql_config --%s" % what).read().strip().split()
+        f = popen("mysql_config --%s" % what)
+        data = f.read().strip().split()
+        if f.close(): data = []
+        return data
 
-    include_dirs = [ i[2:] for i in config('include') ]
+    include_dirs = [ i[2:] for i in config('include') if i.startswith('-i') ]
 
     if mysqlclient == "mysqlclient":
         libs = config("libs")