Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Winkler2011-02-28 14:19:18 +0000
committerStefan Winkler2011-02-28 14:19:18 +0000
commit334a22268c9b9f09dc4db6292a17db47a9e7f590 (patch)
tree0d8b50cb4f73c74e6274a046aa88ff0fcd6f7e1c /plugins/org.eclipse.net4j.db.mysql
parent94b6f046e0d550d56d0dc94261cc97028bc4c641 (diff)
downloadcdo-334a22268c9b9f09dc4db6292a17db47a9e7f590.tar.gz
cdo-334a22268c9b9f09dc4db6292a17db47a9e7f590.tar.xz
cdo-334a22268c9b9f09dc4db6292a17db47a9e7f590.zip
[336532] [DB] MySQL exception when merging branches
https://bugs.eclipse.org/bugs/show_bug.cgi?id=336532
Diffstat (limited to 'plugins/org.eclipse.net4j.db.mysql')
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
index dc395e49f2..c83f9bfae2 100644
--- a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
+++ b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
@@ -149,4 +149,10 @@ public class MYSQLAdapter extends DBAdapter
return super.isTypeIndexable(type);
}
}
+
+ @Override
+ public boolean isDuplicateKeyException(SQLException ex)
+ {
+ return "23000".equals(ex.getSQLState());
+ }
}

Back to the top