*** update_6.inc.old	2011-02-13 21:24:44.000000000 -0800
--- update_6.inc	2011-02-13 21:11:41.000000000 -0800
***************
*** 221,226 ****
--- 221,251 ----
      db_create_table($ret, 'cache_block', $schema['cache_block']);
    }
  
+     // Create the semaphore table now -- the menu system after 6.15 depends on
+     // this table, and menu code runs in updates prior to the table being
+     // created in its original update function, system_update_6054().
+     $schema['semaphore'] = array(
+       'fields' => array(
+         'name' => array(
+           'type' => 'varchar',
+           'length' => 255,
+           'not null' => TRUE,
+           'default' => ''),
+         'value' => array(
+           'type' => 'varchar',
+           'length' => 255,
+           'not null' => TRUE,
+           'default' => ''),
+         'expire' => array(
+           'type' => 'float',
+           'size' => 'big',
+           'not null' => TRUE),
+         ),
+       'indexes' => array('expire' => array('expire')),
+       'primary key' => array('name'),
+     );
+     db_create_table($ret, 'semaphore', $schema['semaphore']);
+ 
    return $ret;
  }