@- OCI8 now returns NULL values in LONG columns correct. (Thies)

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index ec5680401e8cc3b6cb8855cddbbdeb692e443765..d752400fecd27687863af971a7b79cabddb84ac3 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -329,7 +329,7 @@ PHP_MINIT_FUNCTION(oci)
        ELS_FETCH();
 
 #ifdef ZTS
-       oci_globals_id = ts_allocate_id(sizeof(php_oci_globals), php_oci_init_globals, NULL);
+       oci_globals_id = ts_allocate_id(sizeof(php_oci_globals), (ts_allocate_ctor) php_oci_init_globals, NULL);
 #else
        OCI(user_num)   = 1000;
        OCI(server_num) = 2000;
@@ -1314,8 +1314,8 @@ oci_fetch(oci_statement *statement, ub4 nrows, char *func)
                                                                        ((char*)column->data) + column->retlen4,
                                                                        &(column->cb_retlen),
                                                                        OCI_NEXT_PIECE,
-                                                                       NULL,
-                                                                       NULL);
+                                                                       &column->indicator,
+                                                                       &column->retcode);
                        }
                }