Merge branch 'SledjChisl'

1 files changed, 8 insertions, 15 deletions

diff --git a/OpenSim/Data/MySQL/Resources/Avatar.migrations b/OpenSim/Data/MySQL/Resources/Avatar.migrations
index f7cf176..66f75b2 100644
--- a/OpenSim/Data/MySQL/Resources/Avatar.migrations
+++ b/OpenSim/Data/MySQL/Resources/Avatar.migrations
@@ -1,20 +1,13 @@
-:VERSION 1
+:VERSION 3
 
 BEGIN;
 
-CREATE TABLE Avatars (
-        PrincipalID CHAR(36) NOT NULL, 
-        Name VARCHAR(32) NOT NULL, 
-        Value VARCHAR(255) NOT NULL DEFAULT '', 
-        PRIMARY KEY(PrincipalID, Name), 
-        KEY(PrincipalID));
-
-COMMIT;
-
-:VERSION 2
-
-BEGIN;
-
-alter table Avatars change column Value Value text;
+CREATE TABLE IF NOT EXISTS `Avatars` (
+  `PrincipalID` char(36) NOT NULL,
+  `Name` varchar(32) NOT NULL,
+  `Value` text,
+  PRIMARY KEY (`PrincipalID`,`Name`),
+  KEY `PrincipalID` (`PrincipalID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 COMMIT;