Don't block SET NAMES query. Props g30rg3x for the find. fixes WordPress#5503 for 2.4

ryanboren · ryanboren · commit 7e06628e1b7c · 2007-12-22T06:24:48.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@6464 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
@@ -76,11 +76,12 @@ function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
 			return;
 		}
 
+		$this->ready = true;
+
 		if ( !empty($this->charset) && version_compare(mysql_get_server_info(), '4.1.0', '>=') )
  			$this->query("SET NAMES '$this->charset'");
 
 		$this->select($dbname);
-		$this->ready = true;
 	}
 
 	function __destruct() {
@@ -113,6 +114,7 @@ function set_prefix($prefix) {
 	 */
 	function select($db) {
 		if (!@mysql_select_db($db, $this->dbh)) {
+			$this->ready = false;
 			$this->bail("
 <h1>Can&#8217;t select database</h1>
 <p>We were able to connect to the database server (which means your username and password is okay) but not able to select the <code>$db</code> database.</p>
