summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngie Byron2010-04-20 07:51:59 (GMT)
committerAngie Byron2010-04-20 07:51:59 (GMT)
commit2e12586932d04b3d1efc2f353f88848cf5460bc7 (patch)
tree4583e2bca2eca0b08c33432d09c2e7816193efab
parent07ef159518b88245f3f1aa5635784ee7745d619e (diff)
#757214 by justinrandell, scor: Fixed D6->D7 update.php failure: Fatal error: Class 'MergeQuery_mysql()'.
-rw-r--r--includes/update.inc33
1 files changed, 3 insertions, 30 deletions
diff --git a/includes/update.inc b/includes/update.inc
index 51806a3..e0870e2 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -342,36 +342,9 @@ function update_fix_d7_requirements() {
);
db_create_table('role_permission', $schema['role_permission']);
- // Add the {semaphore} table in case menu_rebuild() gets called during
- // an update.
- $schema['semaphore'] = array(
- 'description' => 'Table for holding semaphores, locks, flags, etc. that cannot be stored as Drupal variables since they must not be cached.',
- 'fields' => array(
- 'name' => array(
- 'description' => 'Primary Key: Unique name.',
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- 'default' => ''
- ),
- 'value' => array(
- 'description' => 'A value for the semaphore.',
- 'type' => 'varchar',
- 'length' => 255,
- 'not null' => TRUE,
- 'default' => ''
- ),
- 'expire' => array(
- 'description' => 'A Unix timestamp with microseconds indicating when the semaphore should expire.',
- 'type' => 'float',
- 'size' => 'big',
- 'not null' => TRUE
- ),
- ),
- 'indexes' => array('value' => array('value')),
- 'primary key' => array('name'),
- );
- db_create_table('semaphore', $schema['semaphore']);
+ // Drops and recreates semaphore value index.
+ db_drop_index('semaphore', 'expire');
+ db_add_index('semaphore', 'value', array('value'));
// Add registry tables since these are required during an update.
$schema['registry'] = array(