diff options
| author | Georg Richter <georg@php.net> | 2004-08-25 13:57:35 +0000 |
|---|---|---|
| committer | Georg Richter <georg@php.net> | 2004-08-25 13:57:35 +0000 |
| commit | c8572b0bba9264d9357bc556c07000d913cf0259 (patch) | |
| tree | c3d3f9ee84e99495b6fcd3e9dd1739563e7244f0 /ext/mysqli/php_mysqli.h | |
| parent | b96ebb376f3e35c341521df0c3d517459cfe84de (diff) | |
| download | php-git-c8572b0bba9264d9357bc556c07000d913cf0259.tar.gz | |
changed local_infile_handler:
mysql client lib now uses php_local_infile functions by default, which allows
to use php_fopen_wrapper: e.g. LOAD DATA LOCAL INFILE 'http://foo.com/bar.csv' ...
mysql_set_local_infile_handler now only supports a callback function for read.
Diffstat (limited to 'ext/mysqli/php_mysqli.h')
| -rw-r--r-- | ext/mysqli/php_mysqli.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h index c5a090fa2e..7a29d8b6d3 100644 --- a/ext/mysqli/php_mysqli.h +++ b/ext/mysqli/php_mysqli.h @@ -53,9 +53,8 @@ typedef struct { typedef struct { MYSQL *mysql; - /* callback functions for load data local infile support */ - zval callback_func[3]; - zval *local_infile; + zval *li_read; + php_stream *li_stream; } MY_MYSQL; typedef struct { @@ -112,6 +111,7 @@ extern mysqli_property_entry mysqli_stmt_property_entries[]; extern void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flag, int into_object); extern void php_clear_stmt_bind(MY_STMT *stmt); +void php_clear_mysql(MY_MYSQL *); extern void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type); extern void php_mysqli_report_error(char *sqlstate, int errorno, char *error TSRMLS_DC); extern void php_mysqli_report_index(char *query, unsigned int status TSRMLS_DC); @@ -119,6 +119,7 @@ extern int php_local_infile_init(void **, const char *, void *); extern int php_local_infile_read(void *, char *, uint); extern void php_local_infile_end(void *); extern int php_local_infile_error(void *, char *, uint); +extern void php_set_local_infile_handler_default(MY_MYSQL *); zend_class_entry *mysqli_link_class_entry; zend_class_entry *mysqli_stmt_class_entry; |