[svn:DBD-mysql] r11645 - in DBD-mysql/trunk: . lib/DBD t

[capttofu]

Author: capttofu
Date: Fri Aug 15 04:36:38 2008
New Revision: 11645

Modified:
   DBD-mysql/trunk/dbdimp.c
   DBD-mysql/trunk/lib/DBD/mysql.pm
   DBD-mysql/trunk/t/50commit.t
   DBD-mysql/trunk/t/70takeimp.t
   DBD-mysql/trunk/t/71impdata.t

Log:
Disabled TAKE_IMP_DATA for now.


Modified: DBD-mysql/trunk/dbdimp.c
==============================================================================
--- DBD-mysql/trunk/dbdimp.c	(original)
+++ DBD-mysql/trunk/dbdimp.c	Fri Aug 15 04:36:38 2008
@@ -1562,6 +1562,7 @@
                         imp_dbh->use_server_side_prepare);
 #endif
 
+        /* HELMUT */
 #if defined(sv_utf8_decode) && MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION
         if ((svp = hv_fetch(hv, "mysql_enable_utf8", 17, FALSE)) && *svp) {
           /* Do not touch imp_dbh->enable_utf8 as we are called earlier
@@ -1709,7 +1710,8 @@
   char* mysql_socket;
   D_imp_xxh(dbh);
 
-#define TAKE_IMP_DATA_VERSION 1
+  /* TODO- resolve this so that it is set only if DBI is 1.607 */
+#define TAKE_IMP_DATA_VERSION 0 
 #if TAKE_IMP_DATA_VERSION
   if (DBIc_has(imp_dbh, DBIcf_IMPSET))
   { /* eg from take_imp_data() */
@@ -1800,6 +1802,7 @@
  /* Safer we flip this to TRUE perl side if we detect a mod_perl env. */
   imp_dbh->auto_reconnect = FALSE;
 
+  /* HELMUT */
 #if defined(sv_utf8_decode) && MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION
   imp_dbh->enable_utf8 = FALSE;  /* initialize mysql_enable_utf8 */
 #endif
@@ -2118,6 +2121,7 @@
 
   else if (kl == 31 && strEQ(key,"mysql_unsafe_bind_type_guessing"))
 	imp_dbh->bind_type_guessing = SvIV(valuesv);
+  /*HELMUT */
 #if defined(sv_utf8_decode) && MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION
   else if (kl == 17 && strEQ(key, "mysql_enable_utf8"))
     imp_dbh->enable_utf8 = bool_value;
@@ -2208,6 +2212,7 @@
       const char* msg = mysql_error(imp_dbh->pmysql);
       result= sv_2mortal(newSVpv(msg, strlen(msg)));
     }
+    /* HELMUT */
 #if defined(sv_utf8_decode) && MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION
     else if (kl == strlen("enable_utf8") && strEQ(key, "enable_utf8"))
         result = sv_2mortal(newSViv(imp_dbh->enable_utf8));
@@ -3470,6 +3475,7 @@
           if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
             PerlIO_printf(DBILOGFP, "\t\tst_fetch string data %s\n", fbh->data);
           sv_setpvn(sv, fbh->data, fbh->length);
+          /*HELMUT*/
 #ifdef sv_utf8_decode
           if(imp_dbh->enable_utf8)
               sv_utf8_decode(sv);
@@ -3585,6 +3591,7 @@
         }
         sv_setpvn(sv, col, len);
 	/* UTF8 */
+        /*HELMUT*/
 #if defined(sv_utf8_decode) && MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION
 
 #if MYSQL_VERSION_ID >= FIELD_CHARSETNR_VERSION 

Modified: DBD-mysql/trunk/lib/DBD/mysql.pm
==============================================================================
--- DBD-mysql/trunk/lib/DBD/mysql.pm	(original)
+++ DBD-mysql/trunk/lib/DBD/mysql.pm	Fri Aug 15 04:36:38 2008
@@ -9,7 +9,7 @@
 use Carp ();
 @ISA = qw(DynaLoader);
 
-$VERSION = '4.007';
+$VERSION = '4.008';
 
 bootstrap DBD::mysql $VERSION;
 

Modified: DBD-mysql/trunk/t/50commit.t
==============================================================================
--- DBD-mysql/trunk/t/50commit.t	(original)
+++ DBD-mysql/trunk/t/50commit.t	Fri Aug 15 04:36:38 2008
@@ -110,7 +110,7 @@
 
 }
 else {
-  plan tests => 11; 
+  plan tests => 13; 
 
   ok $dbh->do("DROP TABLE IF EXISTS $table"), "drop table if exists $table";
   my $create =<<EOT;

Modified: DBD-mysql/trunk/t/70takeimp.t
==============================================================================
--- DBD-mysql/trunk/t/70takeimp.t	(original)
+++ DBD-mysql/trunk/t/70takeimp.t	Fri Aug 15 04:36:38 2008
@@ -34,6 +34,7 @@
 unless ($dbh->can('take_imp_data')) {
     plan skip_all => "version of DBI $DBI::VERSION doesn't support this test. Can't
continue test";
 }
+plan skip_all => "This test is disabled";
 plan tests => 21;
 
 pass("obtained driver handle");

Modified: DBD-mysql/trunk/t/71impdata.t
==============================================================================
--- DBD-mysql/trunk/t/71impdata.t	(original)
+++ DBD-mysql/trunk/t/71impdata.t	Fri Aug 15 04:36:38 2008
@@ -24,6 +24,7 @@
 unless ($dbh->can('take_imp_data')) {
     plan skip_all => "version of DBI $DBI::VERSION doesn't support this test. Can't
continue test";
 }
+plan skip_all => "This test is disabled";
 plan tests => 10;
 
 pass("Connected to database");