svn commit: r1487334 - in /syncope/trunk: ./ core/src/main/resources/quartz/tables_mysql_innodb.sql

[ilgrosso]

Author: ilgrosso
Date: Wed May 29 06:53:34 2013
New Revision: 1487334

URL: http://svn.apache.org/r1487334
Log:
[SYNCOPE-375] Merge from 1_1_X

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/core/src/main/resources/quartz/tables_mysql_innodb.sql

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1486919-1487333

Modified: syncope/trunk/core/src/main/resources/quartz/tables_mysql_innodb.sql
URL: 
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/quartz/tables_mysql_innodb.sql?rev=1487334&r1=1487333&r2=1487334&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/quartz/tables_mysql_innodb.sql 
(original)
+++ syncope/trunk/core/src/main/resources/quartz/tables_mysql_innodb.sql Wed 
May 29 06:53:34 2013
@@ -51,7 +51,7 @@ IS_UPDATE_DATA VARCHAR(1) NOT NULL,
 REQUESTS_RECOVERY VARCHAR(1) NOT NULL,
 JOB_DATA BLOB NULL,
 PRIMARY KEY (SCHED_NAME,JOB_NAME,JOB_GROUP))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;
@@ -76,7 +76,7 @@ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRI
 INDEX (SCHED_NAME,JOB_NAME, JOB_GROUP),
 FOREIGN KEY (SCHED_NAME,JOB_NAME,JOB_GROUP)
 REFERENCES QRTZ_JOB_DETAILS(SCHED_NAME,JOB_NAME,JOB_GROUP))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;
@@ -91,7 +91,7 @@ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRI
 INDEX (SCHED_NAME,TRIGGER_NAME, TRIGGER_GROUP),
 FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
 REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;
@@ -105,7 +105,7 @@ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRI
 INDEX (SCHED_NAME,TRIGGER_NAME, TRIGGER_GROUP),
 FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
 REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;
@@ -128,7 +128,7 @@ CREATE TABLE QRTZ_SIMPROP_TRIGGERS
     PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP),
     FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP) 
     REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;
@@ -141,7 +141,7 @@ PRIMARY KEY (SCHED_NAME,TRIGGER_NAME,TRI
 INDEX (SCHED_NAME,TRIGGER_NAME, TRIGGER_GROUP),
 FOREIGN KEY (SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP)
 REFERENCES QRTZ_TRIGGERS(SCHED_NAME,TRIGGER_NAME,TRIGGER_GROUP))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;
@@ -150,7 +150,7 @@ SCHED_NAME VARCHAR(120) NOT NULL,
 CALENDAR_NAME VARCHAR(200) NOT NULL,
 CALENDAR BLOB NOT NULL,
 PRIMARY KEY (SCHED_NAME,CALENDAR_NAME))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;
@@ -158,7 +158,7 @@ CREATE TABLE QRTZ_PAUSED_TRIGGER_GRPS (
 SCHED_NAME VARCHAR(120) NOT NULL,
 TRIGGER_GROUP VARCHAR(200) NOT NULL,
 PRIMARY KEY (SCHED_NAME,TRIGGER_GROUP))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;
@@ -176,7 +176,7 @@ JOB_GROUP VARCHAR(200) NULL,
 IS_NONCONCURRENT VARCHAR(1) NULL,
 REQUESTS_RECOVERY VARCHAR(1) NULL,
 PRIMARY KEY (SCHED_NAME,ENTRY_ID))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;
@@ -186,7 +186,7 @@ INSTANCE_NAME VARCHAR(200) NOT NULL,
 LAST_CHECKIN_TIME BIGINT(13) NOT NULL,
 CHECKIN_INTERVAL BIGINT(13) NOT NULL,
 PRIMARY KEY (SCHED_NAME,INSTANCE_NAME))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;
@@ -194,7 +194,7 @@ CREATE TABLE QRTZ_LOCKS (
 SCHED_NAME VARCHAR(120) NOT NULL,
 LOCK_NAME VARCHAR(40) NOT NULL,
 PRIMARY KEY (SCHED_NAME,LOCK_NAME))
-TYPE=InnoDB;
+ENGINE=InnoDB;
 COMMIT;
 
 BEGIN;