MFH: Fixed bug #24977 (Revert mysql_select_db optimization)

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index dcdbad6cfa503358f1c032311ceb94078208af00..c5e04597feb0357c31d2e8f6a7bf5adfc6a60848 100644 (file)
--- 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;
        }
 }
 /* }}} */