From 99c9dd441e26f58f65bec861756589d94ad7024e Mon Sep 17 00:00:00 2001
From: Frank McSherry <fmcsherry@me.com>
Date: Thu, 4 Mar 2021 15:14:17 -0500
Subject: [PATCH 1/2] collect DD fix for 5983

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index df5fd3477838c..2eddae5ff2d4a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -833,7 +833,7 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
 [[package]]
 name = "differential-dataflow"
 version = "0.11.0"
-source = "git+https://github.com/TimelyDataflow/differential-dataflow.git#cdb9b709715caeaa20ea511eb83d4c4caedef8e4"
+source = "git+https://github.com/TimelyDataflow/differential-dataflow.git#afa441390602ff4ae559a2c2e3f7effabf0476bc"
 dependencies = [
  "abomonation",
  "abomonation_derive",
@@ -883,7 +883,7 @@ checksum = "923dea538cea0aa3025e8685b20d6ee21ef99c4f77e954a30febbaac5ec73a97"
 [[package]]
 name = "dogsdogsdogs"
 version = "0.1.0"
-source = "git+https://github.com/TimelyDataflow/differential-dataflow.git#cdb9b709715caeaa20ea511eb83d4c4caedef8e4"
+source = "git+https://github.com/TimelyDataflow/differential-dataflow.git#afa441390602ff4ae559a2c2e3f7effabf0476bc"
 dependencies = [
  "abomonation",
  "abomonation_derive",

From 7bb42b3b45f3038f0a41ca72ff3f03dec65b7c62 Mon Sep 17 00:00:00 2001
From: Philip Stoev <pstoev@materialize.io>
Date: Fri, 5 Mar 2021 09:04:18 +0100
Subject: [PATCH 2/2] Push test for #5983

---
 test/testdrive/github-5983.td | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 test/testdrive/github-5983.td

diff --git a/test/testdrive/github-5983.td b/test/testdrive/github-5983.td
new file mode 100644
index 0000000000000..303fafea0a982
--- /dev/null
+++ b/test/testdrive/github-5983.td
@@ -0,0 +1,24 @@
+# Copyright Materialize, Inc. All rights reserved.
+#
+# Use of this software is governed by the Business Source License
+# included in the LICENSE file at the root of this repository.
+#
+# As of the Change Date specified in that file, in accordance with
+# the Business Source License, use of this software will be governed
+# by the Apache License, Version 2.0.
+
+#
+# Regression test for https://github.com/MaterializeInc/materialize/issues/5983
+#
+# panic with self-join
+#
+
+$ set-sql-timeout duration=125ms
+
+> CREATE TABLE t1 (f1 INTEGER);
+
+> CREATE TABLE t2 (f1 INTEGER, f2 INTEGER);
+
+> CREATE INDEX i2 ON t2(f1);
+
+> SELECT * FROM t1 WHERE f1 IN (SELECT a1 . f2 FROM t2 AS a1, t2 AS a2 WHERE a2.f1 = a1.f1);