[svn:DBD-mysql] r11991 - DBD-mysql/trunk

[capttofu]

Author: capttofu
Date: Tue Oct 21 06:05:50 2008
New Revision: 11991

Modified:
   DBD-mysql/trunk/dbdimp.c

Log:
Making sure codebase is up to date


Modified: DBD-mysql/trunk/dbdimp.c
==============================================================================
--- DBD-mysql/trunk/dbdimp.c	(original)
+++ DBD-mysql/trunk/dbdimp.c	Tue Oct 21 06:05:50 2008
@@ -1711,7 +1711,7 @@
   D_imp_xxh(dbh);
 
   /* TODO- resolve this so that it is set only if DBI is 1.607 */
-#define TAKE_IMP_DATA_VERSION 1 
+#define TAKE_IMP_DATA_VERSION 1
 #if TAKE_IMP_DATA_VERSION
   if (DBIc_has(imp_dbh, DBIcf_IMPSET))
   { /* eg from take_imp_data() */
@@ -4409,7 +4409,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));