From e7acd99113dfedee1bfcdadd2f81db96ab01e95d Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Wed, 29 Aug 2018 10:00:15 +0200
Subject: [2.1.x] Fixed #29694 -- Fixed column mismatch crash with
 QuerySet.values() or values_list() after combining querysets with extra()
 with union(), difference(), or intersection().

Regression in 0b66c3b442875627fa6daef4ac1e90900d74290b.
Backport of 39461a83c33f0cfe719d3b139413d1f5d1e75d5e from master
---
 docs/releases/2.1.1.txt | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'docs')

diff --git a/docs/releases/2.1.1.txt b/docs/releases/2.1.1.txt
index 07912eead2..759d24c391 100644
--- a/docs/releases/2.1.1.txt
+++ b/docs/releases/2.1.1.txt
@@ -41,3 +41,8 @@ Bugfixes
 
 * Fixed admin change view crash for view-only users if the form has an extra
   form field (:ticket:`29682`).
+
+* Fixed a regression in Django 2.0.5 where ``QuerySet.values()`` or
+  ``values_list()`` after combining querysets with ``extra()`` with
+  ``union()``, ``difference()``, or ``intersection()`` crashed due to
+  mismatching columns (:ticket:`29694`).
-- 
cgit v1.3