Ported changes from trunk.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@10096 b35dd754-fafc-0310-a699-88a17e54d16e

openfire_3_5_0/src/database/openfire_mysql.sql

@@ -77,14 +77,14 @@ CREATE TABLE jivePresence (
 CREATE TABLE jiveRoster (
   rosterID              BIGINT          NOT NULL,
   username              VARCHAR(64)     NOT NULL,
-  jid                   TEXT            NOT NULL,
+  jid                   VARCHAR(1024)   NOT NULL,
   sub                   TINYINT         NOT NULL,
   ask                   TINYINT         NOT NULL,
   recv                  TINYINT         NOT NULL,
   nick                  VARCHAR(255),
   PRIMARY KEY (rosterID),
   INDEX jiveRoster_unameid_idx (username),
-  INDEX jiveRoster_jid_idx (jid(1024))
+  INDEX jiveRoster_jid_idx (jid)
 );
 
 CREATE TABLE jiveRosterGroups (

openfire_3_5_0/src/database/upgrade/14/openfire_mysql.sql

+# jiveRoster: Change jid column to varchar
+ALTER TABLE jiveRoster ALTER COLUMN jid jid varchar(1024) not null;
+
 # jiveRoster: Add new index
-ALTER TABLE jiveRoster ADD INDEX jiveRoster_jid_idx (jid(1024));
+ALTER TABLE jiveRoster ADD INDEX jiveRoster_jid_idx (jid);
 
-UPDATE jiveVersion set version=14 where name = 'openfire';
\ No newline at end of file
+UPDATE jiveVersion set version=14 where name = 'openfire';