- Patch #1464940 by amateescu: move database.inc to proper location.

core/includes/bootstrap.inc

@@ -2421,7 +2421,7 @@ function _drupal_bootstrap_database() {
 
   // Initialize the database system. Note that the connection
   // won't be initialized until it is actually requested.
-  require_once DRUPAL_ROOT . '/core/includes/database/database.inc';
+  require_once DRUPAL_ROOT . '/core/includes/database.inc';
 
   // Register autoload functions so that we can access classes and interfaces.
   // The database autoload routine comes first so that we can load the database

core/includes/install.core.inc

@@ -311,7 +311,7 @@ function install_begin_request(&$install_state) {
   if ($install_state['settings_verified']) {
     // Initialize the database system. Note that the connection
     // won't be initialized until it is actually requested.
-    require_once DRUPAL_ROOT . '/core/includes/database/database.inc';
+    require_once DRUPAL_ROOT . '/core/includes/database.inc';
 
     // Verify the last completed task in the database, if there is one.
     $task = install_verify_completed_task();

core/includes/install.inc

@@ -255,7 +255,7 @@ function drupal_get_database_types() {
   // without modifying the installer.
   // Because we have no registry yet, we need to also include the install.inc
   // file for the driver explicitly.
-  require_once DRUPAL_ROOT . '/core/includes/database/database.inc';
+  require_once DRUPAL_ROOT . '/core/includes/database.inc';
   foreach (file_scan_directory(DRUPAL_ROOT . '/core/lib/Drupal/Core/Database/Driver', '/^[a-z]*$/i', array('recurse' => FALSE)) as $file) {
     if (file_exists($file->uri . '/Install/Tasks.php')) {
       $drivers[$file->filename] = $file->uri;

core/includes/theme.maintenance.inc

@@ -39,7 +39,7 @@ function _drupal_maintenance_theme() {
     // environment, we need to bootstrap just enough to allow hook invocations
     // to work. See _drupal_log_error().
     if (!class_exists('Database', FALSE)) {
-      require_once DRUPAL_ROOT . '/core/includes/database/database.inc';
+      require_once DRUPAL_ROOT . '/core/includes/database.inc';
     }
 
     // We use the default theme as the maintenance theme. If a default theme