diff options
| author | Christopher Jones <sixd@php.net> | 2014-02-24 16:35:08 -0800 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2014-02-24 16:35:08 -0800 |
| commit | 593505f2668cf649efaf67b646793ff3924e87ca (patch) | |
| tree | 7b64fb3f7373cf886637b7b586ebddb1797e2bd9 | |
| parent | bca0e5edd5b80990b36e611da59ee32b6a0a0161 (diff) | |
| parent | 8cdefd3d101fe6c6ebca742b51204b13ab506842 (diff) | |
| download | php-git-593505f2668cf649efaf67b646793ff3924e87ca.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
| -rw-r--r-- | ext/oci8/tests/lob_015.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/oci8/tests/lob_015.phpt b/ext/oci8/tests/lob_015.phpt index b4a19684a3..59e8fec42a 100644 --- a/ext/oci8/tests/lob_015.phpt +++ b/ext/oci8/tests/lob_015.phpt @@ -48,7 +48,7 @@ Warning: oci_bind_by_name() expects at least 3 parameters, 2 given in %s on line Warning: oci_bind_by_name() expects at least 3 parameters, 1 given in %s on line %d -Warning: oci_execute(): ORA-00932: %s NUMBER %s BLOB in %s on line %d +Warning: oci_execute(): ORA-00932: %s on line %d object(OCI-Lob)#%d (1) { ["descriptor"]=> resource(%d) of type (oci8 descriptor) |