? .cache
? .project
? .settings
? 1342_indeed.patch
? 1342_indeed_1.patch
? 197266-2.patch
? 259623-47.patch
? 261258-node-save-required-fields-3.patch
? 266773.actions_syncronize.patch
? 267724_update_fix_cron_7x.21.patch
? 275092-preprocess.patch
? 295697_update_cURL_requirement.patch
? 307297.patch
? 308399-handle-internal-errors-test.patch
? 308399-handle-internal-errors_0.patch
? 313152.patch
? admin_description_1.patch
? advanced-search-test_1.patch
? big_xml_message_6.patch
? blogapi_category-fix-224006-4.patch
? comment_remove_assert_1.patch
? comment_test_0.patch
? contact.test-cleanup_0.patch
? core_required.patch
? database_test-fix-exception-302300-10.patch
? dependency_fix_0.patch
? drupal-file-test-cleanup-310358-7.patch
? drupal.node-permissions_39.patch
? drupal.permissions.patch
? empty.patch
? file_230932.patch
? file_308434_cleanup.patch
? file_cleanup.patch
? file_cleanup_0.patch
? file_cleanup_1.patch
? file_cleanup_2.patch
? file_test_cleanup_0.patch
? file_test_cleanup_2.patch
? filename
? filepath
? filesession_0.patch
? form_cache_6_0_0.patch
? form_cache_7_0.patch
? form_reset_errors_1.patch
? garland_307194.patch
? help.test_0.patch
? individual-comment.test_1.patch
? install-228761-7.patch
? langcode.patch
? less-help-268006-1.patch
? markup_fix.patch
? more!.patch
? mw_176.patch
? mw_184.patch
? mw_187.patch
? mw_191.patch
? no_admin_activ_email_install.patch
? node-type-namespace-206138-18.patch
? node.test-cleanup_2.patch
? node.test-cleanup_6.patch
? preg_64967_0.patch
? protect-masks-238760-71.patch
? rara.patch
? resync_reset.patch
? simpletest-backend-rework_0.patch
? simpletest-check-all.patch
? simpletest-check-all_2.patch
? simpletest-check-all_3.patch
? simpletest-fix-curl-errors-308186-2.patch
? simpletest.js-cleanup_0.patch
? simpletest_clear_permissions_rid.patch
? simpletest_clicklink_0.patch
? simpletest_field_byxpath_2.patch
? simpletest_install_0.patch
? simpletest_ui_0.patch
? somebody.patch
? sortable_node_admin_nodes_15.patch
? spaces_0.patch
? tab_restricted_context.patch
? tabledrag_xindent_2.patch
? taxonomy_breadcrumb%5B1%5D.patch
? taxonomy_isset_plus_test_2.patch
? trackerfix.patch
? trivialfixwithtrickytest.patch
? update_fix_cron_7-x.patch
? update_fix_cron_7-x_2.patch
? vocabulary_static_reset_3.patch
? sites/all/modules
? sites/default/files
? sites/default/settings.php
Index: includes/database/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database/database.inc,v
retrieving revision 1.7
diff -u -p -r1.7 database.inc
--- includes/database/database.inc	26 Sep 2008 19:10:32 -0000	1.7
+++ includes/database/database.inc	27 Sep 2008 06:59:13 -0000
@@ -839,7 +839,7 @@ abstract class Database {
   final protected static function openConnection($key, $target) {
     global $db_prefix;
 
-    if (empty(self::$connectionInfo)) {
+    if (empty(self::$databaseInfo)) {
       self::parseConnectionInfo();
     }
     try {
Index: modules/simpletest/tests/database_test.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/database_test.test,v
retrieving revision 1.6
diff -u -p -r1.6 database_test.test
--- modules/simpletest/tests/database_test.test	26 Sep 2008 19:10:32 -0000	1.6
+++ modules/simpletest/tests/database_test.test	27 Sep 2008 06:59:17 -0000
@@ -127,13 +127,15 @@ class DatabaseConnectionTestCase extends
     // Clone the master credentials to a slave connection.
     // Note this will result in two independent connection objects that happen
     // to point to the same place.
-    $connection_info = Database::getConnectionInfo();
-    Database::addConnectionInfo('default', 'slave', $connection_info['default']['default']);
+    $connection_info = Database::getConnectionInfo('default');
+    Database::addConnectionInfo('default', 'slave', $connection_info['default']);
 
     $db1 = Database::getConnection('default', 'default');
     $db2 = Database::getConnection('default', 'slave');
 
-    $this->assertFalse($db1 === $db2, t('Each target refers to a different connection.'));
+    $this->assertNotNull($db1, t('default connection is a real connection object.'));
+    $this->assertNotNull($db2, t('slave connection is a real connection object.'));
+    $this->assertNotIdentical($db1, $db2, t('Each target refers to a different connection.'));
   }
 
   /**
@@ -152,7 +154,7 @@ class DatabaseConnectionTestCase extends
     $db1 = Database::getConnection('default', 'default');
     $db2 = Database::getConnection('default', 'slave');
 
-    $this->assertTrue($db1 === $db2, t('Both targets refer to the same connection.'));
+    $this->assertIdentical($db1, $db2, t('Both targets refer to the same connection.'));
   }
 
 }