aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLDataStore.cs
diff options
context:
space:
mode:
authorSean Dague2008-06-19 15:03:00 +0000
committerSean Dague2008-06-19 15:03:00 +0000
commitfcd7cf5e4a7ef0a998e3d05236f8cb161e5c1bef (patch)
tree9ae2d62799dd826e69f6c8e75daddf944d35970a /OpenSim/Data/MySQL/MySQLDataStore.cs
parentoops, it helps to reference the *right* migration (diff)
downloadopensim-SC-fcd7cf5e4a7ef0a998e3d05236f8cb161e5c1bef.zip
opensim-SC-fcd7cf5e4a7ef0a998e3d05236f8cb161e5c1bef.tar.gz
opensim-SC-fcd7cf5e4a7ef0a998e3d05236f8cb161e5c1bef.tar.bz2
opensim-SC-fcd7cf5e4a7ef0a998e3d05236f8cb161e5c1bef.tar.xz
fix an edge case with migrations in the region store.
Add migration support to gridstore.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLDataStore.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLDataStore.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLDataStore.cs b/OpenSim/Data/MySQL/MySQLDataStore.cs
index 01cd605..ff1b583 100644
--- a/OpenSim/Data/MySQL/MySQLDataStore.cs
+++ b/OpenSim/Data/MySQL/MySQLDataStore.cs
@@ -1670,6 +1670,10 @@ namespace OpenSim.Data.MySQL
1670 1670
1671 private bool TestTables(MySqlConnection conn, Migration m) 1671 private bool TestTables(MySqlConnection conn, Migration m)
1672 { 1672 {
1673 // we already have migrations, get out of here
1674 if (m.Version > 0)
1675 return false;
1676
1673 MySqlCommand primSelectCmd = new MySqlCommand(m_primSelect, conn); 1677 MySqlCommand primSelectCmd = new MySqlCommand(m_primSelect, conn);
1674 MySqlDataAdapter pDa = new MySqlDataAdapter(primSelectCmd); 1678 MySqlDataAdapter pDa = new MySqlDataAdapter(primSelectCmd);
1675 MySqlCommand shapeSelectCmd = new MySqlCommand(m_shapeSelect, conn); 1679 MySqlCommand shapeSelectCmd = new MySqlCommand(m_shapeSelect, conn);