From c402db2e2f3315dc3292526a6bdae36630026dfe Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Sun, 13 Dec 2015 23:46:41 -0500 Subject: [1.9.x] Fixed #25882 -- Prevented fast deletes matching no rows from crashing on MySQL. Thanks to Trac aliases gerricom for the report, raphaelmerx for the attempts to reproduce and Sergey Fedoseev and Tim for the review. Refs #16891 Backport of 8035cee92293f3319919c8248c7787ba43c05917 from master --- django/db/models/sql/subqueries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/db/models/sql') diff --git a/django/db/models/sql/subqueries.py b/django/db/models/sql/subqueries.py index 35c814f903..266b6a017c 100644 --- a/django/db/models/sql/subqueries.py +++ b/django/db/models/sql/subqueries.py @@ -68,7 +68,7 @@ class DeleteQuery(Query): # We can't do the delete using subquery. values = list(query.values_list('pk', flat=True)) if not values: - return + return 0 return self.delete_batch(values, using) else: innerq.clear_select_clause() -- cgit v1.3