diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-04-23 09:27:07 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-04-23 09:27:07 +0000 |
| commit | a06d3b7bf3ba5e1e1be7f8d5b178666fd732a483 (patch) | |
| tree | c91c8b10a0056a103c7094ef5787b634a067f8c3 | |
| parent | ba5798cb4df6575cf582825b1ee0881b6a5966bd (diff) | |
| download | php-git-a06d3b7bf3ba5e1e1be7f8d5b178666fd732a483.tar.gz | |
revert
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 7 |
2 files changed, 0 insertions, 9 deletions
@@ -12,8 +12,6 @@ PHP NEWS - Fixed bug #41109 (recursiveiterator.inc says "implements" Iterator instead of "extends"). (Marcus) - Fixed bug #41093 (magic_quotes_gpc ignores first arrays keys). (Arpad, Ilia) -- Fixed bug #41083 (mysql_ping() requires MYSQL_OPT_RECONNECT to be set since - MySQL 5.0.13). (xiaojb at gmail dot com, Tony) - Fixed bug #41075 (memleak when creating default object caused exception). (Dmitry) - Fixed bug #41067 (json_encode() problem with UTF-16 input). (jp at df5ea diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index ccbdeba836..57685d95ed 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -39,9 +39,6 @@ PHP_FUNCTION(mysqli_connect) char *hostname = NULL, *username=NULL, *passwd=NULL, *dbname=NULL, *socket=NULL; unsigned int hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0; long port=0; -#if MYSQL_VERSION_ID > 50012 - my_bool my_true = 1; -#endif if (getThis() && !ZEND_NUM_ARGS()) { RETURN_NULL(); @@ -87,10 +84,6 @@ PHP_FUNCTION(mysqli_connect) } #endif -#if MYSQL_VERSION_ID > 50012 - mysql_options(mysql->mysql, MYSQL_OPT_RECONNECT, (const char *)&my_true); -#endif - if (!socket) { socket = MyG(default_socket); } |