From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 8 Aug 2003 13:36:44 +0000 (+0000)
Subject: MFH: Fixed bug #24977 (Revert mysql_select_db optimization)
X-Git-Tag: php-4.3.3RC4~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1167e85cf3093d9ae5e0896b8fb629dcf30c516d;p=php

MFH: Fixed bug #24977 (Revert mysql_select_db optimization)
---

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index dcdbad6cfa..c5e04597fe 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -268,17 +268,12 @@ static void php_mysql_set_default_link(int id TSRMLS_DC)
 */
 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;
 	}
 }
 /* }}} */