cvs: php4 /ext/mysql php_mysql.c

georg Thu Aug 8 04:17:25 2002 EDT Modified files: /php4/ext/mysql php_mysql.c Log: Ups, forgot to remove load_infile tests. Thx to Brad Bulgar Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.149 php4/ext/mysql/php_mysql.c:1.150 --- php4/ext/mysql/php_mysql.c:1.149 Wed Aug 7 18:02:11 2002 +++ php4/ext/mysql/php_mysql.c Thu Aug 8 04:17:24 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.149 2002/08/07 22:02:11 georg Exp $ */ +/* $Id: php_mysql.c,v 1.150 2002/08/08 08:17:24 georg Exp $ */ /* TODO: * @@ -337,7 +337,6 @@ PHP_INI_ENTRY("mysql.default_port", NULL, PHP_INI_ALL, OnMySQLPort) STD_PHP_INI_ENTRY("mysql.default_socket", NULL, PHP_INI_ALL, OnUpdateStringUnempty, default_socket, zend_mysql_globals, mysql_globals) STD_PHP_INI_ENTRY_EX("mysql.connect_timeout", "0", PHP_INI_SYSTEM, OnUpdateInt, connect_timeout, zend_mysql_globals, mysql_globals, display_link_numbers) - STD_PHP_INI_BOOLEAN("mysql.load_infile", "0", PHP_INI_SYSTEM, OnUpdateInt, load_infile, zend_mysql_globals, mysql_globals) PHP_INI_END() /* }}} */ @@ -353,7 +352,6 @@ mysql_globals->connect_errno = 0; mysql_globals->connect_error = NULL; mysql_globals->connect_timeout = 0; - mysql_globals->load_infile = 0; } /* }}} */ @@ -478,11 +476,9 @@ zval **z_host=NULL, **z_user=NULL, **z_passwd=NULL, **z_new_link=NULL, **z_client_flags=NULL; zend_bool free_host=0, new_link=0; long connect_timeout; - long load_infile; connect_timeout = MySG(connect_timeout); - load_infile = MySG(load_infile); socket = MySG(default_socket); @@ -639,7 +635,6 @@ if (connect_timeout != -1) mysql_options(&mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout); - mysql_options(&mysql->conn, MYSQL_OPT_LOCAL_INFILE, (const char *)&load_infile); if (mysql_real_connect(&mysql->conn, host, user, passwd, NULL, port, socket, client_flags)==NULL) { #else