From: Christopher Jones <sixd@php.net>
Date: Fri, 6 Sep 2013 18:05:13 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHPNG_MERGE~222^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac519eaef25ef700e5d381aa6e47eaef6ce82d28;p=php

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Remove obsolete flag
  Update DTrace probes
  Add test for oci_set_* error changes
  Make oci_set_*($connection,...) errors retrievable via oci_error($connection). Improve some error handling to produce error text on some rare edge cases. Disambiguate the Oracle library function call return status values from ORA error numbers. Review and unify error data types.
---

ac519eaef25ef700e5d381aa6e47eaef6ce82d28