Scarab commit: svn commit: r10401 - trunk: . src/sql/mysql/upgrade

Author: ronvoe122
Date: 2006-12-28 07:21:32-0800
New Revision: 10401

Modified:
   trunk/   (props changed)
   trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql
   trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql

Log:
Merged revisions 10374 via svnmerge from 
http://scarab.tigris.org/svn/scarab/branches/release/b21

........
  r10374 | ronvoe122 | 2006-12-01 18:21:36 +0100 (Fr, 01 Dez 2006) | 1 line
  
  Removed 'ENGINE=MyISAM' from mysql upgrade scripts, because this should be a decision of the dba.
........


Modified: trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql?view=diff&rev=10401&p1=trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql&p2=trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql&r1=10400&r2=10401
==============================================================================
--- trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql	(original)
+++ trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-2.sql	2006-12-28 07:21:32-0800
@@ -27,7 +27,7 @@
 --    FOREIGN KEY (RECEIVER_ID) REFERENCES TURBINE_USER (USER_ID),
     FOREIGN KEY (ACTIVITY_ID) REFERENCES SCARAB_ACTIVITY (ACTIVITY_ID),
     INDEX IX_NOTIF_STATUS (STATUS)
-)ENGINE=MyISAM;
+);
 
 --
 -- SCARAB_NOTIFICATION_FILTER
@@ -45,7 +45,7 @@
     PRIMARY KEY(MODULE_ID,USER_ID,ACTIVITY_TYPE,MANAGER_ID),
     FOREIGN KEY (USER_ID) REFERENCES TURBINE_USER (USER_ID),
     FOREIGN KEY (MODULE_ID) REFERENCES SCARAB_MODULE (MODULE_ID)
-)ENGINE=MyISAM;
+);
 
 --
 -- SCARAB_DEFAULT_NOTIFICATION_FILTER
@@ -59,6 +59,6 @@
   FILTER_STATE int(1) NOT NULL default '0',
   MODIFYABlE int(1) NOT NULL default '1',
   PRIMARY KEY  (MODULE_ID,ROLE_ID,ACTIVITY_TYPE,MANAGER_ID)
-)ENGINE=MyISAM;
+);
 
 SET FOREIGN_KEY_CHECKS = 1; 

Modified: trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql?view=diff&rev=10401&p1=trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql&p2=trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql&r1=10400&r2=10401
==============================================================================
--- trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql	(original)
+++ trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b20-1.0b21-3.sql	2006-12-28 07:21:32-0800
@@ -42,7 +42,7 @@
 (TRANSACTION_ID),
     INDEX IX_TYPE_MODULE (TYPE_ID, MODULE_ID),
     INDEX IX_COUNT_PREFIX (ID_COUNT, ID_PREFIX)
-)ENGINE=MyISAM
+)
 SELECT i.ISSUE_ID, i.ID_PREFIX, i.ID_COUNT, i.ID_DOMAIN, i.TYPE_ID,
        i.MODULE_ID, i.CREATED_TRANS_ID,
        max(a.transaction_id) LAST_TRANS_ID,