version up: perl-DBD-MySQL 4.046_01

component/perl-DBD-MySQL/DBD-mysql-4.042.mariadb.patch

-diff -u DBD-mysql-4.042/dbdimp.c DBD-mysql-4.042/dbdimp.c
---- DBD-mysql-4.042/dbdimp.c	2017-02-28 14:36:40.000000000 +0100
-+++ DBD-mysql-4.042/dbdimp.c	2017-06-08 12:43:39.704228470 +0200
-@@ -2139,6 +2139,7 @@
- 
-     if (result)
-     {
-+      my_bool reconnect= 0;
- #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION
-       /* connection succeeded. */
-       /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs
-@@ -2155,7 +2156,7 @@
-         we turn off Mysql's auto reconnect and handle re-connecting ourselves
-         so that we can keep track of when this happens.
-       */
--      result->reconnect=0;
-+      mysql_options(result, MYSQL_OPT_RECONNECT, &reconnect);
-     }
-     else {
-       /* 
-diff -u DBD-mysql-4.042/dbdimp.h DBD-mysql-4.042/dbdimp.h
---- DBD-mysql-4.042/dbdimp.h	2017-02-28 14:36:40.000000000 +0100
-+++ DBD-mysql-4.042/dbdimp.h	2017-06-08 12:44:21.233948264 +0200
-@@ -67,6 +67,12 @@
- #define SSL_LAST_VERIFY_VERSION 50799
- #define MYSQL_VERSION_5_0 50001
- /* This is to avoid the ugly #ifdef mess in dbdimp.c */
-+
-+/* MariaDB Connector/C has MARIADB_VERSION_ID instead of MYSQL_VERSION_ID */
-+#if !defined(MYSQL_VERSION_ID) && defined(MARIADB_VERSION_ID)
-+#define MYSQL_VERSION_ID MARIADB_VERSION_ID
-+#endif
-+
- #if MYSQL_VERSION_ID < SQL_STATE_VERSION
- #define mysql_sqlstate(svsock) (NULL)
- #endif

component/perl-DBD-MySQL/buildout.cfg

@@ -13,11 +13,10 @@ recipe = slapos.recipe.cmmi
 depends =
   ${perl-DBI:location}
   ${perl-Devel-CheckLib:location}
-url = http://www.cpan.org/modules/by-module/DBD/DBD-mysql-4.043.tar.gz
-md5sum = 4a00dd7f1c057931147c65dfc4901c36
+url = https://github.com/perl5-dbi/DBD-mysql/archive/4.046_01.tar.gz
+md5sum = 90f87aec4b7ab95a9543f2dd10969a07
 patches =
   ${:_profile_base_location_}/DBD-mysql-4.027.rpathsupport.patch#a932982b7725e6621cfce3a3d7917e03
-  ${:_profile_base_location_}/DBD-mysql-4.042.mariadb.patch#5864d36d19c4a05034b3a4873f7c659a
 patch-options = -p1
 configure-command =
   ${perl:location}/bin/perl Makefile.PL --libs="-L${zlib:location}/lib -L${openssl:location}/lib $(mysql_config --libs)"