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

Author: mjevans
Date: Wed May 11 01:01:21 2011
New Revision: 14846

Modified:
   dbd-oracle/trunk/Changes
   dbd-oracle/trunk/Oracle.pm

Log:
Add patch from rt 67942

Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes	(original)
+++ dbd-oracle/trunk/Changes	Wed May 11 01:01:21 2011
@@ -1,5 +1,6 @@
 =head1 Changes in DBD-Oracle 1.29_1 (svn rev NNNNN)
 
+  Add /etc to the search paths for tnsnames.ora (rt67942) by Martin J. Evans, Jay Senseman
   Removed support for ProcC connections John Scoles
   Added support for TAF callback by John Scoles
   Fixed some compiler warnings in dbdimp.c and oci8.c by Martin J. Evans

Modified: dbd-oracle/trunk/Oracle.pm
==============================================================================
--- dbd-oracle/trunk/Oracle.pm	(original)
+++ dbd-oracle/trunk/Oracle.pm	Wed May 11 01:01:21 2011
@@ -150,7 +150,7 @@
 	  "$oracle_home/network/admin",	# OCI 7 and 8.1
 	  "$oracle_home/net80/admin",	# OCI 8.0
 	) if $oracle_home;
-	push @tns_admin, "/var/opt/oracle";
+	push @tns_admin, '/var/opt/oracle', '/etc';
 	foreach $d ( DBD::Oracle::ora_env_var("TNS_ADMIN"), ".", @tns_admin  ) {
 	    next unless $d && open(FH, "<$d/tnsnames.ora");
 	    $drh->trace_msg("Loading $d/tnsnames.ora\n") if $debug;