[svn:dbd-oracle] r15079 - dbd-oracle/trunk

Author: yanick
Date: Mon Jan  9 12:45:46 2012
New Revision: 15079

Modified:
   dbd-oracle/trunk/Changes
   dbd-oracle/trunk/Oracle.xs
   dbd-oracle/trunk/dbdimp.c

Log:
TAF support depends on OCI_ATTR_TAF_ENABLED

Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes	(original)
+++ dbd-oracle/trunk/Changes	Mon Jan  9 12:45:46 2012
@@ -1,5 +1,11 @@
 Revision history for DBD::Oracle
 
+1.37_00   2012-01-09
+
+ [BUG FIXES]
+ - TAF supports now conditional to presence of OCI_ATTR_TAF_ENABLED
+    [RT73798]
+
 1.37_00   2011-12-30
 
  [ENHANCEMENTS]

Modified: dbd-oracle/trunk/Oracle.xs
==============================================================================
--- dbd-oracle/trunk/Oracle.xs	(original)
+++ dbd-oracle/trunk/Oracle.xs	Mon Jan  9 12:45:46 2012
@@ -358,9 +358,13 @@
 	sword status;
 	ub4 can_taf = 0;
 	CODE:
+#ifdef OCI_ATTR_TAF_ENABLED
 	OCIAttrGet_log_stat(imp_dbh->srvhp, OCI_HTYPE_SERVER, &can_taf, NULL,
 				OCI_ATTR_TAF_ENABLED, imp_dbh->errhp, status);
 	if (status != OCI_SUCCESS) {
+# else
+    if ( 1 ) {
+# endif
 		oci_error(dbh, imp_dbh->errhp, status, "OCIAttrGet OCI_ATTR_TAF_ENABLED");
 		XSRETURN_IV(0);
 	}

Modified: dbd-oracle/trunk/dbdimp.c
==============================================================================
--- dbd-oracle/trunk/dbdimp.c	(original)
+++ dbd-oracle/trunk/dbdimp.c	Mon Jan  9 12:45:46 2012
@@ -902,8 +902,12 @@
 
     if (imp_dbh->using_taf){
 		bool	can_taf;
+        can_taf = 0;
+
+#ifdef OCI_ATTR_TAF_ENABLED
 		OCIAttrGet_log_stat(imp_dbh->srvhp, OCI_HTYPE_SERVER, &can_taf, NULL,
 				OCI_ATTR_TAF_ENABLED, imp_dbh->errhp, status);
+#endif
 
 		if (!can_taf){
 			croak("You are attempting to enable TAF on a server that is not TAF Enabled \n");