fix merge conflicts

workflow/engine/data/mysql/schema.sql

@@ -843,6 +843,7 @@ CREATE TABLE `USERS`
 	`USR_TIME_ZONE` VARCHAR(100) default '',
 	`USR_DEFAULT_LANG` VARCHAR(10) default '',
 	`USR_LAST_LOGIN` DATETIME,
+	`USR_EXTENDED_ATTRIBUTES_DATA` MEDIUMTEXT,
 	PRIMARY KEY (`USR_UID`),
 	UNIQUE KEY `INDEX_USR_ID` (`USR_ID`),
 	KEY `indexUsrStatus`(`USR_STATUS`),
@@ -3363,5 +3364,26 @@ CREATE TABLE `SCHEDULER`
 	`last_update` DATETIME,
 	PRIMARY KEY (`id`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8';
+#-----------------------------------------------------------------------------
+#-- USER_EXTENDED_ATTRIBUTES
+#-----------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS `USER_EXTENDED_ATTRIBUTES`;
+
+
+CREATE TABLE `USER_EXTENDED_ATTRIBUTES`
+(
+	`UEA_ID` BIGINT(20)  NOT NULL AUTO_INCREMENT,
+	`UEA_NAME` VARCHAR(255),
+	`UEA_ATTRIBUTE_ID` VARCHAR(255),
+	`UEA_HIDDEN` INTEGER,
+	`UEA_REQUIRED` INTEGER,
+	`UEA_PASSWORD` INTEGER,
+	`UEA_OPTION` VARCHAR(255),
+	`UEA_ROLES` MEDIUMTEXT,
+	`UEA_OWNER` BIGINT(20),
+	`UEA_DATE_CREATE` DATETIME,
+	PRIMARY KEY (`UEA_ID`)
+)ENGINE=InnoDB  DEFAULT CHARSET='utf8';
 # This restores the fkey checks, after having unset them earlier
 SET FOREIGN_KEY_CHECKS = 1;