iliaa Fri Aug 8 09:36:44 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mysql php_mysql.c
Log:
MFH: Fixed bug #24977 (Revert mysql_select_db optimization)
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.174.2.20
php-src/ext/mysql/php_mysql.c:1.174.2.21
--- php-src/ext/mysql/php_mysql.c:1.174.2.20 Tue Jul 22 12:06:09 2003
+++ php-src/ext/mysql/php_mysql.c Fri Aug 8 09:36:44 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.174.2.20 2003/07/22 16:06:09 iliaa Exp $ */
+/* $Id: php_mysql.c,v 1.174.2.21 2003/08/08 13:36:44 iliaa Exp $ */
/* TODO:
*
@@ -268,17 +268,12 @@
*/
static int php_mysql_select_db(php_mysql_conn *mysql, char *db TSRMLS_DC)
{
- /* a small optimization to avoid selecting the database if it is already
selected */
- if (mysql->conn.db && !strcmp(mysql->conn.db, db)) {
- return 1;
- } else {
- PHPMY_UNBUFFERED_QUERY_CHECK();
+ PHPMY_UNBUFFERED_QUERY_CHECK();
- if (mysql_select_db(&mysql->conn, db) != 0) {
- return 0;
- } else {
- return 1;
- }
+ if (mysql_select_db(&mysql->conn, db) != 0) {
+ return 0;
+ } else {
+ return 1;
}
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
