cvs: php-src /ext/mysqli mysqli_nonapi.c

tony2001 Mon Apr 23 09:26:58 2007 UTC Modified files: /php-src/ext/mysqli mysqli_nonapi.c Log: revert http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.70&r2=1.71&diff_format=u Index: php-src/ext/mysqli/mysqli_nonapi.c diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.70 php-src/ext/mysqli/mysqli_nonapi.c:1.71 --- php-src/ext/mysqli/mysqli_nonapi.c:1.70 Sat Apr 14 10:42:41 2007 +++ php-src/ext/mysqli/mysqli_nonapi.c Mon Apr 23 09:26:58 2007 @@ -15,7 +15,7 @@ | Author: Georg Richter <georg@php.net> | +----------------------------------------------------------------------+ - $Id: mysqli_nonapi.c,v 1.70 2007/04/14 10:42:41 tony2001 Exp $ + $Id: mysqli_nonapi.c,v 1.71 2007/04/23 09:26:58 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H @@ -39,9 +39,6 @@ char *hostname, *username, *passwd, *dbname, *socket; int hostname_len, username_len, passwd_len, dbname_len, socket_len; long port=0; -#if MYSQL_VERSION_ID > 50012 - my_bool my_true = 1; -#endif if (getThis() && !ZEND_NUM_ARGS()) { RETURN_NULL(); @@ -86,10 +83,6 @@ } #endif -#if MYSQL_VERSION_ID > 50012 - mysql_options(mysql->mysql, MYSQL_OPT_RECONNECT, (const char *)&my_true); -#endif - if (!socket) { socket = MyG(default_socket); }