Flatten migrations for MySQL.

Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Data/MySQL/Resources/UserAccount.migrations

1 files changed, 2 insertions, 14 deletions

diff --git a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
index 87e99fa..008e455 100644
--- a/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
+++ b/OpenSim/Data/MySQL/Resources/UserProfiles.migrations
@@ -1,4 +1,4 @@
-:VERSION 1         # -------------------------------
+:VERSION 5         # -------------------------------
 
 begin;
 
@@ -44,6 +44,7 @@ CREATE TABLE IF NOT EXISTS `userpicks` (
   `posglobal` varchar(255) NOT NULL,
   `sortorder` int(2) NOT NULL,
   `enabled` enum('true','false') NOT NULL,
+  `gatekeeper` varchar(255),
   PRIMARY KEY (`pickuuid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
@@ -66,11 +67,6 @@ CREATE TABLE IF NOT EXISTS `userprofile` (
   PRIMARY KEY (`useruuid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
-commit;
-
-:VERSION 2         # -------------------------------
- 
-begin;
 CREATE TABLE IF NOT EXISTS `userdata` (
     `UserId` char(36) NOT NULL,
     `TagId` varchar(64) NOT NULL,
@@ -79,10 +75,6 @@ CREATE TABLE IF NOT EXISTS `userdata` (
     PRIMARY KEY (`UserId`,`TagId`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
-commit;
-
-:VERSION 3         # -------------------------------
-begin;
 CREATE TABLE IF NOT EXISTS `usersettings` (
   `useruuid` varchar(36) NOT NULL,
   `imviaemail` enum('true','false') NOT NULL,
@@ -90,9 +82,5 @@ CREATE TABLE IF NOT EXISTS `usersettings` (
   `email` varchar(254) NOT NULL,
   PRIMARY KEY (`useruuid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-commit;
 
-:VERSION 4         # -------------------------------
-begin;
-ALTER TABLE userpicks ADD COLUMN gatekeeper varchar(255);
 commit;