r47145 - in /branches/lenny/libdbd-mysql-perl: dbdimp.c debian/changelog

[diocles-guest at users.alioth.debian.org]

Author: diocles-guest
Date: Sat Nov 14 14:49:56 2009
New Revision: 47145

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47145
Log:
Apply patch from CPAN bug 37027 to stop auto_reconnect option causing segmentation faults. (Closes: #520406)

Modified:
    branches/lenny/libdbd-mysql-perl/dbdimp.c
    branches/lenny/libdbd-mysql-perl/debian/changelog

Modified: branches/lenny/libdbd-mysql-perl/dbdimp.c
URL: http://svn.debian.org/wsvn/pkg-perl/branches/lenny/libdbd-mysql-perl/dbdimp.c?rev=47145&op=diff
==============================================================================
--- branches/lenny/libdbd-mysql-perl/dbdimp.c (original)
+++ branches/lenny/libdbd-mysql-perl/dbdimp.c Sat Nov 14 14:49:56 2009
@@ -4391,7 +4391,11 @@
   memcpy (&save_socket, imp_dbh->pmysql,sizeof(save_socket));
   memset (imp_dbh->pmysql,0,sizeof(*(imp_dbh->pmysql)));
 
-  if (!my_login(h, imp_dbh))
+  /* we should disconnect the db handle before reconnecting, this will
+   * prevent my_login from thinking it's adopting an active child which
+   * would prevent the handle from actually reconnecting
+   */
+  if (!dbd_db_disconnect(h, imp_dbh) || !my_login(h, imp_dbh))
   {
     do_error(h, mysql_errno(imp_dbh->pmysql), mysql_error(imp_dbh->pmysql),
              mysql_sqlstate(imp_dbh->pmysql));

Modified: branches/lenny/libdbd-mysql-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/lenny/libdbd-mysql-perl/debian/changelog?rev=47145&op=diff
==============================================================================
--- branches/lenny/libdbd-mysql-perl/debian/changelog (original)
+++ branches/lenny/libdbd-mysql-perl/debian/changelog Sat Nov 14 14:49:56 2009
@@ -1,3 +1,10 @@
+libdbd-mysql-perl (4.007-1+lenny1) stable; urgency=low
+
+  * Apply patch from CPAN bug 37027 to stop auto_reconnect option causing
+    segmentation faults. (Closes: #520406)
+
+ -- Tim Retout <tim at retout.co.uk>  Sat, 14 Nov 2009 14:22:31 +0000
+
 libdbd-mysql-perl (4.007-1) unstable; urgency=low
 
   * New upstream release.