diff options
| author | Christopher Jones <sixd@php.net> | 2013-10-01 05:40:48 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-10-01 05:40:48 -0700 |
| commit | 1d65acea419eb8be6bd4183aefd64087459e3607 (patch) | |
| tree | 2e094fcc1f2e2bc6426ab8ba96a94c1b8d28477b /main/php_ini.c | |
| parent | 86c3378c5c9c1ac76d989e5718ff2a3236ed46bc (diff) | |
| parent | d29a01de3f35a33c539a805e28a22a6514924a19 (diff) | |
| download | php-git-1d65acea419eb8be6bd4183aefd64087459e3607.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Fixed bug #61548
Reverted patch (it was used for internal testing and was committed by accident)
OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
Diffstat (limited to 'main/php_ini.c')
0 files changed, 0 insertions, 0 deletions