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/mysqli_nonapi.c | |
| 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/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 053e1421e8..2d8f48d2a3 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -40,7 +40,6 @@ PHP_FUNCTION(mysqli_connect) unsigned int hostname_len, username_len, passwd_len, dbname_len, socket_len; long port=0; - if (getThis() && !ZEND_NUM_ARGS()) { RETURN_NULL(); } @@ -90,6 +89,9 @@ PHP_FUNCTION(mysqli_connect) mysql->mysql->reconnect = MyG(reconnect); + /* set our own local_infile handler */ + php_set_local_infile_handler_default(mysql); + mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE)); mysqli_resource->ptr = (void *)mysql; @@ -247,7 +249,6 @@ PHP_FUNCTION(mysqli_query) RETURN_FALSE; } - if (!mysql_field_count(mysql->mysql)) { if (MyG(report_mode) & MYSQLI_REPORT_INDEX) { php_mysqli_report_index(query, mysql->mysql->server_status TSRMLS_CC); |