com php-src: fixed merge error in ext/oci8: ext/oci8/oci8 _interface.c
| From: | Anatol Belski | Date: | Thu, 23 Jan 2014 00:10:13 +0000 |
| Subject: | com php-src: fixed merge error in ext/oci8: ext/oci8/oci8 _interface.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75766@lists.php.net to get a copy of this message | ||
Commit: 4be5d97f3dd0f6f22112b4e33959a0c9b5191108
Author: Anatol Belski <ab@php.net> Thu, 23 Jan 2014 01:10:13 +0100
Parents: c0e5d95ca6311a2d97f8dfc9096b3090875a3fdf
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4be5d97f3dd0f6f22112b4e33959a0c9b5191108
Log:
fixed merge error in ext/oci8
Changed paths:
M ext/oci8/oci8_interface.c
Diff:
diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 21259f6...2cf87b6 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1935,8 +1935,8 @@ PHP_FUNCTION(oci_set_db_operation)
PHP_OCI_CALL_RETURN(OCI_G(errcode), OCIAttrSet, ((dvoid *) connection->session, (ub4)
OCI_HTYPE_SESSION, (dvoid *) dbop_name, (ub4) dbop_name_len, (ub4) OCI_ATTR_DBOP, OCI_G(err)));
- if (errstatus != OCI_SUCCESS) {
- connection->errcode = php_oci_error(connection->err, errstatus TSRMLS_CC);
+ if (OCI_G(errcode) != OCI_SUCCESS) {
+ php_oci_error(OCI_G(err), OCI_G(errcode) TSRMLS_CC);
RETURN_FALSE;
}
RETURN_TRUE;