- Patch #333143 by justinrandell: cleaning up the Drupal bootstrap code, removing bootstrap flag in system table.

1 files changed, 9 insertions, 7 deletions

diff --git a/modules/system/system.install b/modules/system/system.install
index bcde1b943..ae9cd81cd 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1208,12 +1208,6 @@ function system_schema() {
         'not null' => TRUE,
         'default' => 0,
       ),
-      'bootstrap' => array(
-        'description' => "Boolean indicating whether this module is loaded during Drupal's early bootstrapping phase (e.g. even before the page cache is consulted).",
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
       'schema_version' => array(
         'description' => "The module's database schema version number. -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed.",
         'type' => 'int',
@@ -1236,7 +1230,6 @@ function system_schema() {
     'primary key' => array('filename'),
     'indexes' => array(
       'modules' => array(array('type', 12), 'status', 'weight', 'filename'),
-      'bootstrap' => array(array('type', 12), 'status', 'bootstrap', 'weight', 'filename'),
     ),
   );
 
@@ -3131,6 +3124,15 @@ function system_update_7013() {
 }
 
 /**
+ * Drop the bootstrap column from the {system} table.
+ */
+function system_update_7014() {
+  $ret = array();
+  db_drop_field($ret, 'system', 'bootstrap');
+  return $ret;
+}
+
+/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */