Index: database/database.mysql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.mysql,v
retrieving revision 1.196
diff -u -r1.196 database.mysql
--- database/database.mysql	12 Sep 2005 18:26:59 -0000	1.196
+++ database/database.mysql	13 Sep 2005 13:38:03 -0000
@@ -129,7 +129,7 @@
   throttle tinyint(1) DEFAULT '0' NOT NULL,
   visibility tinyint(1) DEFAULT '0' NOT NULL,
   pages text NOT NULL,
-  PRIMARY KEY (module, delta)
+  PRIMARY KEY (module, delta, theme)
 ) TYPE=MyISAM;
 
 --
Index: database/database.pgsql
===================================================================
RCS file: /cvs/drupal/drupal/database/database.pgsql,v
retrieving revision 1.135
diff -u -r1.135 database.pgsql
--- database/database.pgsql	12 Sep 2005 18:26:59 -0000	1.135
+++ database/database.pgsql	13 Sep 2005 13:38:14 -0000
@@ -124,7 +124,7 @@
   throttle smallint NOT NULL default '0',
   visibility smallint NOT NULL default '0',
   pages text NOT NULL default '',
-  PRIMARY KEY (module, detla)
+  PRIMARY KEY (module, detla, theme)
 );
 
 --
Index: database/updates.inc
===================================================================
RCS file: /cvs/drupal/drupal/database/updates.inc,v
retrieving revision 1.133
diff -u -r1.133 updates.inc
--- database/updates.inc	12 Sep 2005 20:13:04 -0000	1.133
+++ database/updates.inc	13 Sep 2005 13:38:20 -0000
@@ -5,7 +5,7 @@
  * @file
  * All incremental database updates performed between Drupal releases.
  *
- * For all updates after 147, please use the following syntax:
+ * For all updates after 148, please use the following syntax:
  *
  * function update_N() {
  *   $ret = array();
@@ -815,7 +815,7 @@
 function update_148() {
   $ret = array();
 
-  $ret[] = update_sql('ALTER TABLE {blocks} ADD PRIMARY KEY (module, delta)');
+  $ret[] = update_sql('ALTER TABLE {blocks} ADD PRIMARY KEY (module, delta, theme)');
 
   return $ret;
 }