diff options
| author | joerg <joerg@pkgsrc.org> | 2006-02-26 16:37:41 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-02-26 16:37:41 +0000 |
| commit | 47b1072a8203a13306bda287ee131b2285a16801 (patch) | |
| tree | d7de33ce2d1bcb2a4e30db0ffa8540013627da83 /databases/py-mysqldb | |
| parent | 86b5dc800a37aec66a5b3012f3e7e823d3e1f0cb (diff) | |
| download | pkgsrc-47b1072a8203a13306bda287ee131b2285a16801.tar.gz | |
Fix build with newer MySQL versions: mysql_shutdown can have two
arguments. Version number borrowed from Ruby adapter.
Diffstat (limited to 'databases/py-mysqldb')
| -rw-r--r-- | databases/py-mysqldb/distinfo | 3 | ||||
| -rw-r--r-- | databases/py-mysqldb/patches/patch-ab | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/databases/py-mysqldb/distinfo b/databases/py-mysqldb/distinfo index 039ffd085cd..0fc8e5b6e71 100644 --- a/databases/py-mysqldb/distinfo +++ b/databases/py-mysqldb/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 16:33:09 agc Exp $ +$NetBSD: distinfo,v 1.7 2006/02/26 16:37:41 joerg Exp $ SHA1 (MySQL-python-0.9.2.tar.gz) = b6959ee5e28847e557229ddc318b097f10144ff2 RMD160 (MySQL-python-0.9.2.tar.gz) = f7ef371e8f2c0a3b6979a99bfa368e4342aa4080 Size (MySQL-python-0.9.2.tar.gz) = 64258 bytes SHA1 (patch-aa) = 27ab8d1f675197e1fdaf5760dbdad5ea95043f59 +SHA1 (patch-ab) = d063f5a51fef1ed20015a7370ff80f37c7317bf5 diff --git a/databases/py-mysqldb/patches/patch-ab b/databases/py-mysqldb/patches/patch-ab new file mode 100644 index 00000000000..42e07456e90 --- /dev/null +++ b/databases/py-mysqldb/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.1 2006/02/26 16:37:41 joerg Exp $ + +--- _mysql.c.orig 2002-08-01 05:01:30.000000000 +0000 ++++ _mysql.c +@@ -39,6 +39,7 @@ PERFORMANCE OF THIS SOFTWARE. + + #include "structmember.h" + #include "mysql.h" ++#include "mysql_version.h" + #include "mysqld_error.h" + #include "errmsg.h" + +@@ -1353,7 +1354,11 @@ _mysql_ConnectionObject_shutdown( + if (!PyArg_NoArgs(args)) return NULL; + check_connection(self); + Py_BEGIN_ALLOW_THREADS ++#if MYSQL_VERSION_ID >= 40103 ++ r = mysql_shutdown(&(self->connection), SHUTDOWN_DEFAULT); ++#else + r = mysql_shutdown(&(self->connection)); ++#endif + Py_END_ALLOW_THREADS + if (r) return _mysql_Exception(self); + Py_INCREF(Py_None); |