[482886] A more aggressive fix that involves an extra commitcommitters/estepper/commit-after-ddl

https://bugs.eclipse.org/bugs/show_bug.cgi?id=482886

2 files changed, 9 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index 90514b8911..62b19a9641 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -896,6 +896,13 @@ public class DBStoreAccessor extends StoreAccessor implements IDBStoreAccessor,
 
       IMappingStrategy mappingStrategy = store.getMappingStrategy();
       mappingStrategy.createMapping(connection, packageUnits, monitor.fork());
+
+      int writePackageUnits; // TODO Extra commit needed for Mysql between DDL and DML.
+      connection.commit();
+    }
+    catch (SQLException ex)
+    {
+      throw new DBException(ex);
     }
     finally
     {
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
index 1cdbe40908..bbfd573f00 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/StoreAccessor.java
@@ -77,8 +77,9 @@ public abstract class StoreAccessor extends StoreAccessorBase
     {
       monitor.begin(1 + newPackageUnits.length + 2 + newObjects.length + detachedObjects.length + dirtyCount + 1);
 
-      writeCommitInfo(branch, timeStamp, previousTimeStamp, userID, commitComment, monitor.fork());
+      int writePackageUnits; // TODO writePackageUnits() first.
       writePackageUnits(newPackageUnits, monitor.fork(newPackageUnits.length));
+      writeCommitInfo(branch, timeStamp, previousTimeStamp, userID, commitComment, monitor.fork());
 
       IDGenerationLocation idGenerationLocation = store.getRepository().getIDGenerationLocation();
       if (idGenerationLocation == IDGenerationLocation.STORE)