Merge branch 'stable-2.15' * stable-2.15: Scope enter keypress on file-list locally PolyGerrit: Fix message in Move Dialog text box Use ?nullNamePatternMatchesAll=true with mysql 6.0.6 Fix diff base gitweb link Change-Id: I9f3cf4a9d4f8b789779706e3bfb1174d13ab38e8

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
index c7475a9..c91748c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java

@@ -191,12 +191,7 @@
       ProjectState state = projectCache.get(resource.getRevision().getChange().getProject());
 
       DiffInfo result = new DiffInfo();
-      // TODO referring to the parent commit by refs/changes/12/60012/1^1
-      // will likely not work for inline edits
-      String revA =
-          basePatchSet != null
-              ? basePatchSet.getRefName()
-              : resource.getRevision().getPatchSet().getRefName() + "^1";
+      String revA = basePatchSet != null ? basePatchSet.getRefName() : content.commitIdA;
       String revB =
           resource.getRevision().getEdit().isPresent()
               ? resource.getRevision().getEdit().get().getRefName()

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
index a761794..ffa2293 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java

@@ -41,6 +41,8 @@
     b.append(port(dbs.optional("port")));
     b.append("/");
     b.append(dbs.required("database"));
+    // See https://stackoverflow.com/questions/42084633/table-name-pattern-can-not-be-null-or-empty-in-java
+    b.append("?nullNamePatternMatchesAll=true");
     return b.toString();
   }