archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- renamed rollback function to _restore_connection_default

Browse source 
- in _restore_connection_default:
  - unset the selected database (thx to Paul DuBois)
  - set session variable autocommit to default (=1)
This commit is contained in:
Georg Richter 2002-09-09 15:53:05 +00:00
parent bdcd8e3f03
commit a9c64d174b
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ext/mysql/php_mysql.c
View file

@ -223,12 +223,14 @@ void timeout(int sig);
#define CHECK_LINK(link) { if (link==-1) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "A link to the server could not be established"); RETURN_FALSE; } }
/* {{{ _rollback_mysql_transactions
/* {{{ _restore_connection_defaults
*/
static int _rollback_mysql_transactions(zend_rsrc_list_entry *rsrc TSRMLS_DC)
static int _restore_connection_defaults(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
php_mysql_conn *link;
char query[128];
char user[128];
char passwd[128];
/* check if its a persistent link */
if (Z_TYPE_P(rsrc) != le_plink)
@ -240,6 +242,17 @@ static int _rollback_mysql_transactions(zend_rsrc_list_entry *rsrc TSRMLS_DC)
strcpy (query, "ROLLBACK");
mysql_real_query(&link->conn, query, strlen(query));
/* restore session variable "autocommit" to default (=1) */
strcpy (query, "SET AUTOCOMMIT=1");
mysql_real_query(&link->conn, query, strlen(query));
/* unset the current selected db */
#if MYSQL_VERSION_ID > 32329
strcpy (user, (char *)(&link->conn)->user);
strcpy (passwd, (char *)(&link->conn)->passwd);
mysql_change_user(&link->conn, user, passwd, "");
#endif
return 0;
}
/* }}} */
@ -420,7 +433,7 @@ PHP_RINIT_FUNCTION(mysql)
*/
PHP_RSHUTDOWN_FUNCTION(mysql)
{
zend_hash_apply(&EG(persistent_list), (apply_func_t) _rollback_mysql_transactions TSRMLS_CC);
zend_hash_apply(&EG(persistent_list), (apply_func_t) _restore_connection_defaults TSRMLS_CC);
if (MySG(connect_error)!=NULL) {
efree(MySG(connect_error));