diff options
| author | Zak Greant <zak@php.net> | 2002-10-09 13:46:18 +0000 | 
|---|---|---|
| committer | Zak Greant <zak@php.net> | 2002-10-09 13:46:18 +0000 | 
| commit | 70e49320f100dbf6dbc486de6b8d9082c4f30f53 (patch) | |
| tree | d1381b29476e55315e7f71d33a1d8d9d0498e746 | |
| parent | a75eb9c4ddb55e0e37d3f7a0cf547cdab87faf77 (diff) | |
| download | php-git-70e49320f100dbf6dbc486de6b8d9082c4f30f53.tar.gz | |
Removed spurious code. Thanks Derick
| -rw-r--r-- | ext/mysql/php_mysql.c | 13 | 
1 files changed, 4 insertions, 9 deletions
diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 883b4ae0cf..512ad45967 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -229,7 +229,6 @@ void timeout(int sig);  static int _restore_connection_defaults(zend_rsrc_list_entry *rsrc TSRMLS_DC)  {  	php_mysql_conn *link; -	char	query[17];		/* Increase size if query length increases */  	char	user[128];  	char 	passwd[128]; @@ -252,14 +251,10 @@ static int _restore_connection_defaults(zend_rsrc_list_entry *rsrc TSRMLS_DC)  	}  	/* rollback possible transactions */ -	memcpy(query, "ROLLBACK", sizeof("ROLLBACK")); -	/* Binary safe query not required here */ -	mysql_query(&link->conn, query); - -	/* restore session variable "autocommit" to default (=1) */ -	memcpy(query, "SET AUTOCOMMIT=1", sizeof("SET AUTOCOMMIT=1")); -	/* Binary safe query not required here */ -	mysql_query(&link->conn, query); +	mysql_query(&link->conn, "ROLLBACK"); + +	/* restore session variable "autocommit" to default (1) */ +	mysql_query(&link->conn, "SET AUTOCOMMIT=1");  	/* unset the current selected db */  #if MYSQL_VERSION_ID > 32329  | 
