georg Sun Jun 6 04:52:19 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli_fe.c php_mysqli.h
Log:
removed conditional defines for load_data_infile_handlers on windows
(4.1.2 windows build is fixed now on mysql.com)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.82&r2=1.83&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.82 php-src/ext/mysqli/mysqli_api.c:1.83
--- php-src/ext/mysqli/mysqli_api.c:1.82 Sat Jun 5 14:31:56 2004
+++ php-src/ext/mysqli/mysqli_api.c Sun Jun 6 04:52:19 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.82 2004/06/05 18:31:56 georg Exp $
+ $Id: mysqli_api.c,v 1.83 2004/06/06 08:52:19 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1042,7 +1042,6 @@
}
/* }}} */
-#ifndef PHP_WIN32
/* {{{ proto mysqli_set_local_infile_default(object link)
unsets user defined handler for load local infile command */
PHP_FUNCTION(mysqli_set_local_infile_default)
@@ -1105,7 +1104,6 @@
&php_local_infile_end, &php_local_infile_error, (void
*)mysql);
}
/* }}} */
-#endif
/* {{{ proto bool mysqli_more_results(object link)
check if there any more query results from a multi query */
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.36&r2=1.37&ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.36 php-src/ext/mysqli/mysqli_fe.c:1.37
--- php-src/ext/mysqli/mysqli_fe.c:1.36 Sat Jun 5 14:31:56 2004
+++ php-src/ext/mysqli/mysqli_fe.c Sun Jun 6 04:52:19 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.36 2004/06/05 18:31:56 georg Exp $
+ $Id: mysqli_fe.c,v 1.37 2004/06/06 08:52:19 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -96,10 +96,8 @@
PHP_FE(mysqli_info,
NULL)
PHP_FE(mysqli_insert_id,
NULL)
PHP_FE(mysqli_kill,
NULL)
-#ifndef PHP_WIN32
PHP_FE(mysqli_set_local_infile_default, NULL)
PHP_FE(mysqli_set_local_infile_handler, NULL)
-#endif
PHP_FE(mysqli_master_query,
NULL)
PHP_FE(mysqli_more_results,
NULL)
PHP_FE(mysqli_multi_query,
NULL)
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.36&r2=1.37&ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.36 php-src/ext/mysqli/php_mysqli.h:1.37
--- php-src/ext/mysqli/php_mysqli.h:1.36 Sat Jun 5 14:31:56 2004
+++ php-src/ext/mysqli/php_mysqli.h Sun Jun 6 04:52:19 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.36 2004/06/05 18:31:56 georg Exp $
+ $Id: php_mysqli.h,v 1.37 2004/06/06 08:52:19 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -310,10 +310,8 @@
PHP_FUNCTION(mysqli_insert_id);
PHP_FUNCTION(mysqli_init);
PHP_FUNCTION(mysqli_kill);
-#ifndef PHP_WIN32
PHP_FUNCTION(mysqli_set_local_infile_default);
PHP_FUNCTION(mysqli_set_local_infile_handler);
-#endif
PHP_FUNCTION(mysqli_master_query);
PHP_FUNCTION(mysqli_more_results);
PHP_FUNCTION(mysqli_multi_query);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
