Revision: 16709
http://sourceforge.net/p/gate/code/16709
Author: ian_roberts
Date: 2013-06-17 13:10:23 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
Merged r16554 from trunk - replace TYPE=InnoDB with ENGINE=InnoDB as the former
is no longer supported in MySQL 5.5
Revision Links:
--------------
http://sourceforge.net/p/gate/code/16554
Modified Paths:
--------------
teamware/branches/1.4/executive/metadata/sql/mysql-create-full.sql
teamware/branches/1.4/executive/metadata/sql/mysql-create.sql
Property Changed:
----------------
teamware/branches/1.4/executive/metadata/sql/
Index: teamware/branches/1.4/executive/metadata/sql
===================================================================
--- teamware/branches/1.4/executive/metadata/sql 2013-06-08 01:18:54 UTC
(rev 16708)
+++ teamware/branches/1.4/executive/metadata/sql 2013-06-17 13:10:23 UTC
(rev 16709)
Property changes on: teamware/branches/1.4/executive/metadata/sql
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1 ##
+/teamware/trunk/executive/metadata/sql:16554
\ No newline at end of property
Modified: teamware/branches/1.4/executive/metadata/sql/mysql-create-full.sql
===================================================================
--- teamware/branches/1.4/executive/metadata/sql/mysql-create-full.sql
2013-06-08 01:18:54 UTC (rev 16708)
+++ teamware/branches/1.4/executive/metadata/sql/mysql-create-full.sql
2013-06-17 13:10:23 UTC (rev 16709)
@@ -293,7 +293,7 @@
INDEX idx_user (user_id),
INDEX (banlist_ip),
INDEX (banlist_email)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_categories'
@@ -305,7 +305,7 @@
display_order INT NOT NULL default '0',
moderated TINYINT(1) DEFAULT '0',
PRIMARY KEY (categories_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_config'
@@ -316,7 +316,7 @@
config_value varchar(255) NOT NULL default '',
config_id int not null auto_increment,
PRIMARY KEY(config_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_forums'
@@ -334,7 +334,7 @@
PRIMARY KEY (forum_id),
KEY (categories_id),
INDEX idx_forums_cats (categories_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_forums_watch'
@@ -345,7 +345,7 @@
user_id INT NOT NULL,
INDEX idx_fw_forum (forum_id),
INDEX idx_fw_user (user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_groups'
@@ -357,7 +357,7 @@
group_description varchar(255) default NULL,
parent_id INT default '0',
PRIMARY KEY (group_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
DROP TABLE IF EXISTS jforum_user_groups;
@@ -366,7 +366,7 @@
user_id INT NOT NULL,
INDEX idx_group (group_id),
INDEX idx_user (user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_roles'
@@ -378,7 +378,7 @@
name varchar(255) NOT NULL,
INDEX idx_group (group_id),
INDEX idx_name (name)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_role_values'
@@ -388,7 +388,7 @@
role_id INT NOT NULL,
role_value VARCHAR(255),
INDEX idx_role(role_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_posts'
@@ -416,7 +416,7 @@
KEY (forum_id),
KEY(post_time),
INDEX (need_moderate)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_posts_text'
@@ -426,7 +426,7 @@
post_id INT NOT NULL PRIMARY KEY,
post_text TEXT,
post_subject VARCHAR(100)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_privmsgs'
@@ -445,14 +445,14 @@
privmsgs_enable_smilies tinyint(1) NOT NULL default '1',
privmsgs_attach_sig tinyint(1) NOT NULL default '1',
PRIMARY KEY (privmsgs_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
DROP TABLE IF EXISTS jforum_privmsgs_text;
CREATE TABLE jforum_privmsgs_text (
privmsgs_id INT NOT NULL,
privmsgs_text TEXT,
PRIMARY KEY ( privmsgs_id )
-) Type=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_ranks'
@@ -465,7 +465,7 @@
rank_special tinyint(1) default NULL,
rank_image varchar(255) default NULL,
PRIMARY KEY (rank_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_sessions'
@@ -480,7 +480,7 @@
session_page int(11) NOT NULL default '0',
session_logged_int tinyint(1) default NULL,
INDEX idx_sessions_users (session_user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_smilies'
@@ -492,7 +492,7 @@
url varchar(100) default NULL,
disk_name varchar(255),
PRIMARY KEY (smilie_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_themes'
@@ -503,7 +503,7 @@
template_name varchar(30) NOT NULL default '',
style_name varchar(30) NOT NULL default '',
PRIMARY KEY (themes_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_topics'
@@ -530,7 +530,7 @@
KEY(topic_first_post_id),
KEY(topic_last_post_id),
KEY(topic_moved_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_topics_watch'
@@ -542,7 +542,7 @@
is_read tinyint(1) DEFAULT 1,
INDEX idx_topic (topic_id),
INDEX idx_user (user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_users'
@@ -604,7 +604,7 @@
user_karma DOUBLE,
user_authhash VARCHAR(32),
PRIMARY KEY (user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_vote_desc'
@@ -618,7 +618,7 @@
vote_length int(11) NOT NULL default '0',
PRIMARY KEY (vote_id),
INDEX(topic_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_vote_results'
@@ -630,7 +630,7 @@
vote_option_text varchar(255) NOT NULL default '',
vote_result int(11) NOT NULL default '0',
INDEX(vote_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_vote_voters'
@@ -642,7 +642,7 @@
vote_user_ip varchar(15) NOT NULL default '',
INDEX(vote_id),
INDEX(vote_user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_words'
@@ -653,7 +653,7 @@
word varchar(100) NOT NULL default '',
replacement varchar(100) NOT NULL default '',
PRIMARY KEY (word_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_karma'
@@ -671,7 +671,7 @@
KEY(topic_id),
KEY(post_user_id),
KEY(from_user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_bookmark'
@@ -687,7 +687,7 @@
description varchar(255),
INDEX book_idx_relation (relation_id),
KEY(user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_quota_limit'
--
@@ -697,7 +697,7 @@
quota_desc VARCHAR(50) NOT NULL,
quota_limit INT NOT NULL,
quota_type TINYINT(1) DEFAULT '1'
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_extension_groups'
@@ -709,7 +709,7 @@
allow TINYINT(1) DEFAULT '1',
upload_icon VARCHAR(100),
download_mode TINYINT(1) DEFAULT '1'
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_extensions'
@@ -724,7 +724,7 @@
allow TINYINT(1) DEFAULT '1',
KEY(extension_group_id),
INDEX(extension)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_attach'
@@ -738,7 +738,7 @@
INDEX idx_att_post(post_id),
INDEX idx_att_priv(privmsgs_id),
INDEX idx_att_user(user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_attach_desc'
@@ -758,7 +758,7 @@
extension_id INT,
INDEX idx_att_d_att(attach_id),
INDEX idx_att_d_ext(extension_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_attach_quota'
@@ -769,7 +769,7 @@
group_id INT NOT NULL,
quota_limit_id INT NOT NULL,
KEY(group_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_banner'
@@ -790,7 +790,7 @@
banner_width INT NOT NULL DEFAULT '0',
banner_height INT NOT NULL DEFAULT '0',
KEY(banner_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_mail_integration'
@@ -805,7 +805,7 @@
pop_port INT DEFAULT 110,
pop_ssl TINYINT DEFAULT '0',
KEY(forum_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
@@ -816,7 +816,7 @@
api_id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
api_key VARCHAR(32) NOT NULL,
api_validity DATETIME NOT NULL
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_moderation_log'
@@ -834,5 +834,5 @@
post_user_id INT DEFAULT 0,
KEY(user_id),
KEY(post_user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
Modified: teamware/branches/1.4/executive/metadata/sql/mysql-create.sql
===================================================================
--- teamware/branches/1.4/executive/metadata/sql/mysql-create.sql
2013-06-08 01:18:54 UTC (rev 16708)
+++ teamware/branches/1.4/executive/metadata/sql/mysql-create.sql
2013-06-17 13:10:23 UTC (rev 16709)
@@ -182,7 +182,7 @@
INDEX idx_user (user_id),
INDEX (banlist_ip),
INDEX (banlist_email)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_categories'
@@ -194,7 +194,7 @@
display_order INT NOT NULL default '0',
moderated TINYINT(1) DEFAULT '0',
PRIMARY KEY (categories_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_config'
@@ -205,7 +205,7 @@
config_value varchar(255) NOT NULL default '',
config_id int not null auto_increment,
PRIMARY KEY(config_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_forums'
@@ -223,7 +223,7 @@
PRIMARY KEY (forum_id),
KEY (categories_id),
INDEX idx_forums_cats (categories_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_forums_watch'
@@ -234,7 +234,7 @@
user_id INT NOT NULL,
INDEX idx_fw_forum (forum_id),
INDEX idx_fw_user (user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_groups'
@@ -246,7 +246,7 @@
group_description varchar(255) default NULL,
parent_id INT default '0',
PRIMARY KEY (group_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
DROP TABLE IF EXISTS jforum_user_groups;
@@ -255,7 +255,7 @@
user_id INT NOT NULL,
INDEX idx_group (group_id),
INDEX idx_user (user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_roles'
@@ -267,7 +267,7 @@
name varchar(255) NOT NULL,
INDEX idx_group (group_id),
INDEX idx_name (name)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_role_values'
@@ -277,7 +277,7 @@
role_id INT NOT NULL,
role_value VARCHAR(255),
INDEX idx_role(role_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_posts'
@@ -305,7 +305,7 @@
KEY (forum_id),
KEY(post_time),
INDEX (need_moderate)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_posts_text'
@@ -315,7 +315,7 @@
post_id INT NOT NULL PRIMARY KEY,
post_text TEXT,
post_subject VARCHAR(100)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_privmsgs'
@@ -334,14 +334,14 @@
privmsgs_enable_smilies tinyint(1) NOT NULL default '1',
privmsgs_attach_sig tinyint(1) NOT NULL default '1',
PRIMARY KEY (privmsgs_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
DROP TABLE IF EXISTS jforum_privmsgs_text;
CREATE TABLE jforum_privmsgs_text (
privmsgs_id INT NOT NULL,
privmsgs_text TEXT,
PRIMARY KEY ( privmsgs_id )
-) Type=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_ranks'
@@ -354,7 +354,7 @@
rank_special tinyint(1) default NULL,
rank_image varchar(255) default NULL,
PRIMARY KEY (rank_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_sessions'
@@ -369,7 +369,7 @@
session_page int(11) NOT NULL default '0',
session_logged_int tinyint(1) default NULL,
INDEX idx_sessions_users (session_user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_smilies'
@@ -381,7 +381,7 @@
url varchar(100) default NULL,
disk_name varchar(255),
PRIMARY KEY (smilie_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_themes'
@@ -392,7 +392,7 @@
template_name varchar(30) NOT NULL default '',
style_name varchar(30) NOT NULL default '',
PRIMARY KEY (themes_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_topics'
@@ -419,7 +419,7 @@
KEY(topic_first_post_id),
KEY(topic_last_post_id),
KEY(topic_moved_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_topics_watch'
@@ -431,7 +431,7 @@
is_read tinyint(1) DEFAULT 1,
INDEX idx_topic (topic_id),
INDEX idx_user (user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_users'
@@ -493,7 +493,7 @@
user_karma DOUBLE,
user_authhash VARCHAR(32),
PRIMARY KEY (user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_vote_desc'
@@ -507,7 +507,7 @@
vote_length int(11) NOT NULL default '0',
PRIMARY KEY (vote_id),
INDEX(topic_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_vote_results'
@@ -519,7 +519,7 @@
vote_option_text varchar(255) NOT NULL default '',
vote_result int(11) NOT NULL default '0',
INDEX(vote_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_vote_voters'
@@ -531,7 +531,7 @@
vote_user_ip varchar(15) NOT NULL default '',
INDEX(vote_id),
INDEX(vote_user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_words'
@@ -542,7 +542,7 @@
word varchar(100) NOT NULL default '',
replacement varchar(100) NOT NULL default '',
PRIMARY KEY (word_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_karma'
@@ -560,7 +560,7 @@
KEY(topic_id),
KEY(post_user_id),
KEY(from_user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_bookmark'
@@ -576,7 +576,7 @@
description varchar(255),
INDEX book_idx_relation (relation_id),
KEY(user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_quota_limit'
--
@@ -586,7 +586,7 @@
quota_desc VARCHAR(50) NOT NULL,
quota_limit INT NOT NULL,
quota_type TINYINT(1) DEFAULT '1'
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_extension_groups'
@@ -598,7 +598,7 @@
allow TINYINT(1) DEFAULT '1',
upload_icon VARCHAR(100),
download_mode TINYINT(1) DEFAULT '1'
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_extensions'
@@ -613,7 +613,7 @@
allow TINYINT(1) DEFAULT '1',
KEY(extension_group_id),
INDEX(extension)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_attach'
@@ -627,7 +627,7 @@
INDEX idx_att_post(post_id),
INDEX idx_att_priv(privmsgs_id),
INDEX idx_att_user(user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_attach_desc'
@@ -647,7 +647,7 @@
extension_id INT,
INDEX idx_att_d_att(attach_id),
INDEX idx_att_d_ext(extension_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_attach_quota'
@@ -658,7 +658,7 @@
group_id INT NOT NULL,
quota_limit_id INT NOT NULL,
KEY(group_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_banner'
@@ -679,7 +679,7 @@
banner_width INT NOT NULL DEFAULT '0',
banner_height INT NOT NULL DEFAULT '0',
KEY(banner_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_mail_integration'
@@ -694,7 +694,7 @@
pop_port INT DEFAULT 110,
pop_ssl TINYINT DEFAULT '0',
KEY(forum_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
@@ -705,7 +705,7 @@
api_id INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
api_key VARCHAR(32) NOT NULL,
api_validity DATETIME NOT NULL
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
--
-- Table structure for table 'jforum_moderation_log'
@@ -723,5 +723,5 @@
post_user_id INT DEFAULT 0,
KEY(user_id),
KEY(post_user_id)
-) TYPE=InnoDB;
+) ENGINE=InnoDB;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
