| commit | 2c750e90dc3bbb4bb4e859f672526758d27b3851 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Mon Jun 17 16:17:02 2019 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Mon Jun 17 16:17:02 2019 +0900 |
| tree | fd2c779def9d4fa7f13cffc1fb4d393a6ea8ea0e | |
| parent | 4a11629f7c4f894cfa31aa7b0709a919337b6b9d [diff] | |
| parent | b214d441d96776429ea151374235ea3d2394cfec [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: MysqlAccountPatchReviewStore: Fix duplicate key detection Bazel: Bump minimum supported version to 0.26.1 Change-Id: Ibe2385bc61f548422755dd00fbc1de82a01322b0
diff --git a/.bazelversion b/.bazelversion index b2525e3..260bb30 100644 --- a/.bazelversion +++ b/.bazelversion
@@ -1 +1,2 @@ -0.27.0rc3 \ No newline at end of file +0.26.1 +
diff --git a/WORKSPACE b/WORKSPACE index e351c6f..304faf5 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -65,7 +65,7 @@ load("@bazel_skylib//lib:versions.bzl", "versions") -versions.check(minimum_bazel_version = "0.25.0") +versions.check(minimum_bazel_version = "0.26.1") load("@io_bazel_rules_closure//closure:defs.bzl", "closure_repositories")
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java index d648ed0..cb8c707 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java
@@ -38,7 +38,7 @@ @Override public OrmException convertError(String op, SQLException err) { - switch (getSQLStateInt(err)) { + switch (err.getErrorCode()) { case 1022: // ER_DUP_KEY case 1062: // ER_DUP_ENTRY case 1169: // ER_DUP_UNIQUE;