- Rollback. :-)

modules/block/block.module

@@ -146,8 +146,6 @@ function _block_rehash() {
 
   init_theme();
 
-  db_lock_table('blocks');
-
   $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $theme_key);
   while ($old_block = db_fetch_object($result)) {
     $old_blocks[$old_block->module][$old_block->delta] = $old_block;
@@ -187,6 +185,7 @@ function _block_rehash() {
     }
   }
 
+  db_lock_table('blocks');
   // Remove all blocks from table.
   db_query("DELETE FROM {blocks} WHERE theme = '%s'", $theme_key);