diff options
| -rw-r--r-- | databases/p5-DBD-mysql/Makefile | 2 | ||||
| -rw-r--r-- | databases/p5-DBD-mysql/distinfo | 6 | ||||
| -rw-r--r-- | databases/p5-DBD-mysql/files/patch-dbdimp.c | 98 | ||||
| -rw-r--r-- | databases/p5-DBD-mysql/files/patch-dbdimp.h | 14 |
4 files changed, 4 insertions, 116 deletions
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile index 077d12fc9fe5..c213c1f3b864 100644 --- a/databases/p5-DBD-mysql/Makefile +++ b/databases/p5-DBD-mysql/Makefile @@ -6,7 +6,7 @@ # PORTNAME= DBD-mysql -PORTVERSION= 4.003 +PORTVERSION= 4.005 CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= DBD diff --git a/databases/p5-DBD-mysql/distinfo b/databases/p5-DBD-mysql/distinfo index 4e13a6e953a2..eccc5a446915 100644 --- a/databases/p5-DBD-mysql/distinfo +++ b/databases/p5-DBD-mysql/distinfo @@ -1,3 +1,3 @@ -MD5 (DBD-mysql-4.003.tar.gz) = 157f817d26a52aaaff61ce38f7043b95 -SHA256 (DBD-mysql-4.003.tar.gz) = 13b3867d30dfa1d7da541998af7b0168ee607dcd664185ca40f3bb9de4f76140 -SIZE (DBD-mysql-4.003.tar.gz) = 121582 +MD5 (DBD-mysql-4.005.tar.gz) = 39181a061348ad76b67c99326873ccd5 +SHA256 (DBD-mysql-4.005.tar.gz) = 6cc6c5e07e4951ff3663aba3ff315dc1441f83eabcaa71787dd1fed6c6504ecb +SIZE (DBD-mysql-4.005.tar.gz) = 122524 diff --git a/databases/p5-DBD-mysql/files/patch-dbdimp.c b/databases/p5-DBD-mysql/files/patch-dbdimp.c deleted file mode 100644 index 74bf38f8b8bc..000000000000 --- a/databases/p5-DBD-mysql/files/patch-dbdimp.c +++ /dev/null @@ -1,98 +0,0 @@ ---- dbdimp.c.orig Thu Mar 22 10:30:12 2007 -+++ dbdimp.c Thu Mar 22 10:31:00 2007 -@@ -3413,11 +3413,7 @@ - if (!imp_sth->result) - { - do_error(sth, JW_ERR_SEQUENCE, "fetch() without execute()" --#if MYSQL_VERSION_ID >= SQL_STATE_VERSION - ,NULL); --#else -- ); --#endif - return Nullav; - } - -@@ -3577,11 +3573,7 @@ - if (mysql_errno(&imp_dbh->mysql)) - do_error(sth, mysql_errno(&imp_dbh->mysql), - mysql_error(&imp_dbh->mysql) --#if MYSQL_VERSION_ID >= SQL_STATE_VERSION - , mysql_sqlstate(&imp_dbh->mysql)); --#else -- ); --#endif - - - #if MYSQL_VERSION_ID >= MULTIPLE_RESULT_SET_VERSION -@@ -3909,11 +3901,7 @@ - /* Are we asking for a legal value? */ - if (what < 0 || what >= AV_ATTRIB_LAST) - do_error(sth, JW_ERR_NOT_IMPLEMENTED, "Not implemented" --#if MYSQL_VERSION_ID >= SQL_STATE_VERSION - , NULL); --#else -- ); --#endif - - /* Return cached value, if possible */ - else if (cacheit && imp_sth->av_attr[what]) -@@ -3923,11 +3911,7 @@ - else if (!res) - do_error(sth, JW_ERR_NOT_ACTIVE, - "statement contains no result" --#if MYSQL_VERSION_ID >= SQL_STATE_VERSION - ,NULL); --#else -- ); --#endif - /* Do the real work. */ - else - { -@@ -4238,11 +4222,7 @@ - { - do_error(sth, JW_ERR_ILLEGAL_PARAM_NUM, - "Illegal parameter number" --#if MYSQL_VERSION_ID >= SQL_STATE_VERSION - , NULL); --#else -- ); --#endif - return FALSE; - } - -@@ -4265,11 +4245,7 @@ - "Binding non-numeric field %d, value %s as a numeric!", - param_num, neatsvpv(value,0)); - do_error(sth, JW_ERR_ILLEGAL_PARAM_NUM, err_msg --#if MYSQL_VERSION_ID >= SQL_STATE_VERSION - ,NULL); --#else -- ); --#endif - } - } - -@@ -4277,11 +4253,7 @@ - { - do_error(sth, JW_ERR_NOT_IMPLEMENTED, - "Output parameters not implemented" --#if MYSQL_VERSION_ID >= SQL_STATE_VERSION - ,NULL); --#else -- ); --#endif - return FALSE; - } - -@@ -4439,11 +4411,7 @@ - if (!my_login(h, imp_dbh)) - { - do_error(h, mysql_errno(&imp_dbh->mysql), mysql_error(&imp_dbh->mysql) --#if MYSQL_VERSION_ID >= SQL_STATE_VERSION - , mysql_sqlstate(&imp_dbh->mysql)); --#else -- ); --#endif - memcpy (&imp_dbh->mysql, &save_socket, sizeof(save_socket)); - ++imp_dbh->stats.auto_reconnects_failed; - return FALSE; diff --git a/databases/p5-DBD-mysql/files/patch-dbdimp.h b/databases/p5-DBD-mysql/files/patch-dbdimp.h deleted file mode 100644 index 7bc62d957ad7..000000000000 --- a/databases/p5-DBD-mysql/files/patch-dbdimp.h +++ /dev/null @@ -1,14 +0,0 @@ ---- dbdimp.h.orig Thu Mar 22 10:28:38 2007 -+++ dbdimp.h Thu Mar 22 10:28:54 2007 -@@ -282,11 +282,7 @@ - #endif - - #include <dbd_xsh.h> --#if MYSQL_VERSION_ID >= SQL_STATE_VERSION - void do_error (SV* h, int rc, const char *what, const char *sqlstate); --#else --void do_error (SV* h, int rc, const char *what); --#endif - SV *dbd_db_fieldlist (MYSQL_RES* res); - - void dbd_preparse (imp_sth_t *imp_sth, SV *statement); |