Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.176
diff -u -p -r1.176 install.php
--- install.php	2 Jun 2009 06:58:15 -0000	1.176
+++ install.php	4 Jun 2009 16:19:17 -0000
@@ -267,7 +267,7 @@ function install_settings_form(&$form_st
       '#size' => 45,
     );
 
-    // Database username
+    // Database password
     $form['basic_options']['password'] = array(
       '#type' => 'password',
       '#title' => st('Database password'),
Index: includes/install.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.inc,v
retrieving revision 1.91
diff -u -p -r1.91 install.inc
--- includes/install.inc	24 May 2009 17:39:30 -0000	1.91
+++ includes/install.inc	4 Jun 2009 16:19:17 -0000
@@ -287,7 +287,7 @@ abstract class DatabaseInstaller {
       return FALSE;
     }
     foreach ($this->tests as $test) {
-      $return = $this->runTestQuery($test['query'], $test['success'], $test['message'], !empty($tests['fatal']));
+      $return = $this->runTestQuery($test['query'], $test['success'], $test['message'], !empty($test['fatal']));
       if ($return === FALSE) {
         return FALSE;
       }
@@ -303,11 +303,14 @@ abstract class DatabaseInstaller {
    */
   protected function testConnect() {
     try {
+      //this doesn't actually test the connection so....
       db_set_active();
+      //actually do a check
+      Database::getConnection();
       $this->success[] = 'CONNECT';
     }
     catch (Exception $e) {
-      drupal_set_message(st('Failed to connect to your %name database server. %name reports the following message: %error.<ul><li>Are you sure you have the correct username and password?</li><li>Are you sure that you have typed the correct database hostname?</li><li>Are you sure that the database server is running?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => $e->getMessage(), 'name' => $this->name())), 'error');
+      drupal_set_message(st('Failed to connect to your %name database server. %name reports the following message: <b>%error.</b><ul><li>Are you sure that you have typed the correct database hostname?</li><li>Are you sure that the database server is running?</li><li>Are you sure you have the correct database name?</li><li>Are you sure you have the correct username and password?</li></ul>For more help, see the <a href="http://drupal.org/node/258">Installation and upgrading handbook</a>. If you are unsure what these terms mean you should probably contact your hosting provider.', array('%error' => $e->getMessage(), '%name' => $this->name())), 'error');
       return FALSE;
     }
   }