diff options
| author | Matteo Beccati <mbeccati@php.net> | 2009-05-12 21:35:21 +0000 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2009-05-12 21:35:21 +0000 |
| commit | 7ab5d01e2373217a74b89d6292fc34576bcf61d2 (patch) | |
| tree | c66c9da8d3eaeccfcccff556f94e246b41e5ae1b /ext/pdo_oci/php_pdo_oci_int.h | |
| parent | a9c5adcfc623faa9257e1811b2772cf8e3c1927d (diff) | |
| download | php-git-7ab5d01e2373217a74b89d6292fc34576bcf61d2.tar.gz | |
MFB
- Updated PDO_OCI to the latest version (from PHP_5_3 branch)
# This commit reverts some changes to the tests. Given the very high
# failure ratio of the current tests on HEAD I'm not going to fix them
# now. Keeping ext/pdo_oci in sync with 5.3 will be much more helpful when
# merging. The effort to fix the tests can start when 5.3 is out.
Diffstat (limited to 'ext/pdo_oci/php_pdo_oci_int.h')
| -rwxr-xr-x | ext/pdo_oci/php_pdo_oci_int.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ext/pdo_oci/php_pdo_oci_int.h b/ext/pdo_oci/php_pdo_oci_int.h index c0b3012136..1df36dd65c 100755 --- a/ext/pdo_oci/php_pdo_oci_int.h +++ b/ext/pdo_oci/php_pdo_oci_int.h @@ -38,8 +38,8 @@ typedef struct { ub2 charset; sword last_err; - unsigned attached:1; - unsigned _reserved:31; + unsigned attached:1; + unsigned _reserved:31; pdo_oci_error_info einfo; } pdo_oci_db_handle; @@ -51,7 +51,9 @@ typedef struct { sb2 indicator; char *data; - unsigned long datalen; + ub4 datalen; + + ub2 dtype; } pdo_oci_column; @@ -60,10 +62,11 @@ typedef struct { OCIStmt *stmt; OCIError *err; sword last_err; - ub2 stmt_type; - ub4 exec_type; + ub2 stmt_type; + ub4 exec_type; pdo_oci_column *cols; pdo_oci_error_info einfo; + unsigned int have_blobs:1; } pdo_oci_stmt; typedef struct { |