Author: byterock
Date: Mon Jul 28 11:44:15 2008
New Revision: 11606
Modified:
dbd-oracle/trunk/Oracle.pm
dbd-oracle/trunk/Oracle.xs
dbd-oracle/trunk/oci8.c
Log:
some more changes from RC2 testing
Modified: dbd-oracle/trunk/Oracle.pm
==============================================================================
--- dbd-oracle/trunk/Oracle.pm (original)
+++ dbd-oracle/trunk/Oracle.pm Mon Jul 28 11:44:15 2008
@@ -1184,12 +1184,11 @@
error then the most likely cause is DBD::ORACLE cannot find your .ORA
(TNSNAMES.ORA, LISTENER.ORA, SQLNET.ORA) files. This can be solved by setting
the
TNS_ADMIN environment variable to the directory where these files can be found.
-If you get to this stage you then either of the following errors;
+If you get to this stage and you then either one of the following errors;
ORA-12560: TNS:protocol adapter error
ORA-12162: TNS:net service name is incorrectly specified
-
usually means that DBD::Oracle can find the listener but the it cannot connect
to the DB because the listener cannot find the DB you asked for.
=head2 Connection Examples Using DBD::Oracle
Modified: dbd-oracle/trunk/Oracle.xs
==============================================================================
--- dbd-oracle/trunk/Oracle.xs (original)
+++ dbd-oracle/trunk/Oracle.xs Mon Jul 28 11:44:15 2008
@@ -21,7 +21,7 @@
ORA_CHAR = 96
ORA_CHARZ = 97
ORA_MLSLABEL = 105
- ORA_XMLTYPE = 108
+ ORA_XMLTYPE = ORA_XMLTYPE
ORA_CLOB = 112
ORA_BLOB = 113
ORA_RSET = 116
Modified: dbd-oracle/trunk/oci8.c
==============================================================================
--- dbd-oracle/trunk/oci8.c (original)
+++ dbd-oracle/trunk/oci8.c Mon Jul 28 11:44:15 2008
@@ -242,7 +242,7 @@
/* case OCI_SUPPRESS_NLS_VALIDATION: return
"SUPPRESS_NLS_VALIDATION"; suppress nls validation*/
/* nls validation suppression is on by default;*/
/* use OCI_ENABLE_NLS_VALIDATION to disable it */
- case OCI_MUTEX_TRY: return "MUTEX_TRY"; /*
try and acquire mutex */
+/* case OCI_MUTEX_TRY: return "MUTEX_TRY"; try
and acquire mutex */
/* case OCI_NCHAR_LITERAL_REPLACE_ON: return
"NCHAR_LITERAL_REPLACE_ON"; nchar literal replace on */
/* case OCI_NCHAR_LITERAL_REPLACE_OFF:return
"NCHAR_LITERAL_REPLACE_OFF"; nchar literal replace off*/
/* case OCI_ENABLE_NLS_VALIDATION: return
"ENABLE_NLS_VALIDATION"; enable nls validation */
