georg Mon Sep 9 11:53:05 2002 EDT
Modified files:
/php4/ext/mysql php_mysql.c
Log:
- renamed rollback function to _restore_connection_default
- in _restore_connection_default:
- unset the selected database (thx to Paul DuBois)
- set session variable autocommit to default (=1)
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.159 php4/ext/mysql/php_mysql.c:1.160
--- php4/ext/mysql/php_mysql.c:1.159 Fri Sep 6 08:11:30 2002
+++ php4/ext/mysql/php_mysql.c Mon Sep 9 11:53:05 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.159 2002/09/06 12:11:30 georg Exp $ */
+/* $Id: php_mysql.c,v 1.160 2002/09/09 15:53:05 georg Exp $ */
/* TODO:
*
@@ -223,12 +223,14 @@
#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 @@
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_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));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
