From 63dba2a07da80609306e9e09e88cc989bbd71de6 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 19 May 2010 19:14:43 +0000
Subject: [PATCH] - Patch #692044 by Damien Tournoud, effulgentsia, jbrown: a
 site with statistics module enabled is much slower in serving cached pages in
 D7 than in D6.

---
 includes/update.inc           | 5 -----
 modules/block/block.install   | 7 +++++++
 modules/system/system.install | 2 +-
 modules/update/update.install | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/includes/update.inc b/includes/update.inc
index 317ffa5776c..bc2501296db 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -164,11 +164,6 @@ function update_prepare_d7_bootstrap() {
           'not null' => TRUE,
           'default' => 0,
         ),
-        'headers' => array(
-          'description' => 'Any custom HTTP headers to be added to cached data.',
-          'type' => 'text',
-          'not null' => FALSE,
-        ),
         'serialized' => array(
           'description' => 'A flag to indicate whether content is serialized (1) or not (0).',
           'type' => 'int',
diff --git a/modules/block/block.install b/modules/block/block.install
index ce2633eea8e..8f6863a90ee 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -387,3 +387,10 @@ function block_update_7004() {
   // Rebuild theme data, so the new 'help' region is identified.
   system_rebuild_theme_data();
 }
+
+/**
+ * Remove {cache_block}.headers column.
+ */
+function block_update_7005() {
+  db_drop_field('cache_block', 'headers');
+}
diff --git a/modules/system/system.install b/modules/system/system.install
index a80e6ceda54..38eec361da2 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -2380,7 +2380,7 @@ function system_update_7053() {
  * Remove {cache_*}.headers columns.
  */
 function system_update_7054() {
-  $cache_tables = array('cache', 'cache_bootstrap', 'cache_filter', 'cache_form', 'cache_menu', 'cache_page', 'cache_path');
+  $cache_tables = array('cache', 'cache_filter', 'cache_form', 'cache_menu', 'cache_page', 'cache_path');
   foreach ($cache_tables as $table) {
     db_drop_field($table, 'headers');
   }
diff --git a/modules/update/update.install b/modules/update/update.install
index f324ce5703d..5bc855847f7 100644
--- a/modules/update/update.install
+++ b/modules/update/update.install
@@ -169,7 +169,7 @@ function update_update_7000() {
 }
 
 /**
- * Remove {cache_update}.headers columns.
+ * Remove {cache_update}.headers column.
  */
 function update_update_7001() {
   db_drop_field('cache_update', 'headers');