3 files changed, 41 insertions, 1 deletions

diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs
index 2bd246a..2e6de7c 100644
--- a/OpenSim/Data/MySQL/MySQLLogData.cs
+++ b/OpenSim/Data/MySQL/MySQLLogData.cs
@@ -65,6 +65,36 @@ namespace OpenSim.Data.MySQL
                 database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword,
                                             settingPooling, settingPort);
             }
+
+            // This actually does the roll forward assembly stuff
+            Assembly assem = GetType().Assembly;
+            Migration m = new Migration(database.Connection, assem, "LogStore");
+
+            // TODO: After rev 6000, remove this.  People should have
+            // been rolled onto the new migration code by then.
+            TestTables(m);
+
+            m.Update();
+
+        }
+
+        private void TestTables(Migration m)
+        {
+            // under migrations, bail
+            if (m.Version > 0)
+                return;
+
+            Dictionary<string, string> tableList = new Dictionary<string, string>();
+            tableList["logs"] = null;
+            database.GetTableVersion(tableList);
+            
+            // migrations will handle it
+            if (tableList["logs"] == null)
+                return;
+
+            // we have the table, so pretend like we did the first migration in the past
+            if (m.Version == 0)
+                m.Version = 1;
         }
 
         /// <summary>
diff --git a/OpenSim/Data/MySQL/Resources/001_LogStore.sql b/OpenSim/Data/MySQL/Resources/001_LogStore.sql
new file mode 100644
index 0000000..b4c29fb
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/001_LogStore.sql
@@ -0,0 +1,10 @@
+CREATE TABLE `logs` (
+  `logID` int(10) unsigned NOT NULL auto_increment,
+  `target` varchar(36) default NULL,
+  `server` varchar(64) default NULL,
+  `method` varchar(64) default NULL,
+  `arguments` varchar(255) default NULL,
+  `priority` int(11) default NULL,
+  `message` text,
+  PRIMARY KEY  (`logID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/OpenSim/Data/MySQL/Resources/CreateLogsTable.sql b/OpenSim/Data/MySQL/Resources/CreateLogsTable.sql
index 64b3a80..53dcd31 100644
--- a/OpenSim/Data/MySQL/Resources/CreateLogsTable.sql
+++ b/OpenSim/Data/MySQL/Resources/CreateLogsTable.sql
@@ -7,4 +7,4 @@ CREATE TABLE `logs` (
   `priority` int(11) default NULL,
   `message` text,
   PRIMARY KEY  (`logID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8