diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-08-08 13:36:44 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-08-08 13:36:44 +0000 |
| commit | 1167e85cf3093d9ae5e0896b8fb629dcf30c516d (patch) | |
| tree | fce87e6b984801bf17e18ea74d7e5e2dfd3b0da7 /ext/mysql/php_mysql.c | |
| parent | 77225b912fe5b4438ec6bfdb991e971e55c21ff1 (diff) | |
| download | php-git-1167e85cf3093d9ae5e0896b8fb629dcf30c516d.tar.gz | |
MFH: Fixed bug #24977 (Revert mysql_select_db optimization)
Diffstat (limited to 'ext/mysql/php_mysql.c')
| -rw-r--r-- | ext/mysql/php_mysql.c | 15 |
1 files changed, 5 insertions, 10 deletions
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; } } /* }}} */ |