Index: branches/5.2.x/install/install_schema.sql
===================================================================
diff -u -N -r14884 -r15244
--- branches/5.2.x/install/install_schema.sql	(.../install_schema.sql)	(revision 14884)
+++ branches/5.2.x/install/install_schema.sql	(.../install_schema.sql)	(revision 15244)
@@ -89,26 +89,26 @@
 );
 
 CREATE TABLE OrderItems (
-  OrderItemId int(11) NOT NULL auto_increment,
-  OrderId int(11) NOT NULL default '0',
-  ProductId int(11) NOT NULL default '0',
-  ProductName varchar(255) NOT NULL default '',
-  Quantity int(11) NOT NULL default '0',
-  QuantityReserved int(11) default NULL,
-  FlatPrice decimal(10,4) NOT NULL default '0.0000',
-  Price decimal(10,4) NOT NULL default '0.0000',
-  Cost double(10,4) NOT NULL default '0.0000',
-  BackOrderFlag tinyint(4) default '0',
-  Weight double default NULL,
-  ShippingTypeId varchar(255) default NULL,
+  OrderItemId int(11) NOT NULL AUTO_INCREMENT,
+  OrderId int(11) NOT NULL DEFAULT '0',
+  ProductId int(11) NOT NULL DEFAULT '0',
+  ProductName varchar(255) NOT NULL DEFAULT '',
+  Quantity int(11) NOT NULL DEFAULT '0',
+  QuantityReserved int(11) DEFAULT NULL,
+  FlatPrice decimal(10,4) NOT NULL DEFAULT '0.0000',
+  Price decimal(10,4) NOT NULL DEFAULT '0.0000',
+  Cost double(10,4) NOT NULL DEFAULT '0.0000',
+  BackOrderFlag tinyint(4) DEFAULT '0',
+  Weight double DEFAULT NULL,
+  ShippingTypeId varchar(255) DEFAULT NULL,
   ItemData text,
-  OptionsSalt int(11) default '0',
-  SplitShippingGroup int(11) NOT NULL default '0',
-  PackageNum int(11) NOT NULL default '0',
-  ReturnType tinyint(3) unsigned NOT NULL default '0',
-  ReturnAmount decimal(10,2) NOT NULL default '0.00',
-  ReturnedOn int(10) unsigned default NULL,
-  PRIMARY KEY  (OrderItemId),
+  OptionsSalt bigint(11) DEFAULT '0',
+  SplitShippingGroup int(11) NOT NULL DEFAULT '0',
+  PackageNum int(11) NOT NULL DEFAULT '0',
+  ReturnType tinyint(3) unsigned NOT NULL DEFAULT '0',
+  ReturnAmount decimal(10,2) NOT NULL DEFAULT '0.00',
+  ReturnedOn int(10) unsigned DEFAULT NULL,
+  PRIMARY KEY (OrderItemId),
   KEY OrderId (OrderId),
   KEY ProductId (ProductId),
   KEY BackOrderFlag (BackOrderFlag),
@@ -672,7 +672,7 @@
   CombinationId int(11) NOT NULL AUTO_INCREMENT,
   ProductId int(11) NOT NULL DEFAULT '0',
   Combination text,
-  CombinationCRC int(11) NOT NULL DEFAULT '0',
+  CombinationCRC bigint(11) NOT NULL DEFAULT '0',
   PriceType tinyint(1) DEFAULT '3',
   Price float DEFAULT NULL,
   WeightType tinyint(1) DEFAULT '3',