From 77c523ec0f3783f7660f490ac438655e4322b288 Mon Sep 17 00:00:00 2001
From: onefang
Date: Fri, 3 Sep 2021 06:27:01 +1000
Subject: Change the database schemas for a few, might be able to create them
 now.

Would have saved a lot of time if OpenSim didn't quietly fail these.
---
 OpenSim/Data/MySQL/Resources/AuthStore.migrations       |  2 +-
 OpenSim/Data/MySQL/Resources/GridUserStore.migrations   |  2 +-
 OpenSim/Data/MySQL/Resources/os_groups_Store.migrations | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Data/MySQL/Resources/AuthStore.migrations b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
index ee2fe17..3f13884 100644
--- a/OpenSim/Data/MySQL/Resources/AuthStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AuthStore.migrations
@@ -19,6 +19,6 @@ CREATE TABLE IF NOT EXISTS `tokens` (
   KEY `UUID` (`UUID`),
   KEY `token` (`token`),
   KEY `validity` (`validity`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
index c79b66f..83491ec 100644
--- a/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/GridUserStore.migrations
@@ -3,7 +3,7 @@
 BEGIN;
 
 CREATE TABLE IF NOT EXISTS `GridUser` (
-    `UserID` VARCHAR(255) NOT NULL,
+    `UserID` CHAR(36) NOT NULL,
     `HomeRegionID` CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
     `HomePosition` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
     `HomeLookAt` CHAR(64) NOT NULL DEFAULT '<0,0,0>',
diff --git a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
index e95b768..dfea50d 100644
--- a/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
+++ b/OpenSim/Data/MySQL/Resources/os_groups_Store.migrations
@@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS `os_groups_groups` (
   PRIMARY KEY  (`GroupID`),
   UNIQUE KEY `Name` (`Name`),
   FULLTEXT KEY `Name_2` (`Name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM;
 
 
 CREATE TABLE IF NOT EXISTS `os_groups_membership` (
@@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `os_groups_membership` (
   `AccessToken` char(36) NOT NULL default '',
   PRIMARY KEY  (`GroupID`,`PrincipalID`),
   KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM;
 
 
 CREATE TABLE IF NOT EXISTS `os_groups_roles` (
@@ -43,7 +43,7 @@ CREATE TABLE IF NOT EXISTS `os_groups_roles` (
   `Powers` bigint(20) unsigned NOT NULL default '0',
   PRIMARY KEY  (`GroupID`,`RoleID`),
   KEY `GroupID` (`GroupID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM;
 
 
 CREATE TABLE IF NOT EXISTS `os_groups_rolemembership` (
@@ -52,7 +52,7 @@ CREATE TABLE IF NOT EXISTS `os_groups_rolemembership` (
   `PrincipalID` VARCHAR(255) NOT NULL default '',
   PRIMARY KEY  (`GroupID`,`RoleID`,`PrincipalID`),
   KEY `PrincipalID` (`PrincipalID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM;
 
 
 CREATE TABLE IF NOT EXISTS `os_groups_invites` (
@@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS `os_groups_invites` (
   `TMStamp` timestamp NOT NULL,
   PRIMARY KEY  (`InviteID`),
   UNIQUE KEY `PrincipalGroup` (`GroupID`,`PrincipalID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM;
 
 
 CREATE TABLE IF NOT EXISTS `os_groups_notices` (
@@ -81,13 +81,13 @@ CREATE TABLE IF NOT EXISTS `os_groups_notices` (
   PRIMARY KEY  (`NoticeID`),
   KEY  `GroupID` (`GroupID`),
   KEY `TMStamp` (`TMStamp`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM;
 
 CREATE TABLE IF NOT EXISTS `os_groups_principals` (
   `PrincipalID` VARCHAR(255) NOT NULL default '',
   `ActiveGroupID` char(36) NOT NULL default '',
   PRIMARY KEY  (`PrincipalID`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+) ENGINE=MyISAM;
 
 COMMIT;
 
-- 
cgit v1.1