From: Antony Dovgal <tony2001@php.net>
Date: Mon, 23 Apr 2007 09:27:07 +0000 (+0000)
Subject: revert
X-Git-Tag: php-5.2.2RC2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a06d3b7bf3ba5e1e1be7f8d5b178666fd732a483;p=php

revert
---

diff --git a/NEWS b/NEWS
index 1fdff12206..e11f43f3d3 100644
--- a/NEWS
+++ b/NEWS
@@ -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);
 	}