From 228654d17fd461908dbc887c837f282470d5c810 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 9 Sep 2011 23:02:33 +0000
Subject: [PATCH] Added two pointless query repeats to work around a known
 issue with MySQL that was causing failures in our test suite.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16753 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 tests/regressiontests/queries/tests.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/regressiontests/queries/tests.py b/tests/regressiontests/queries/tests.py
index a66752ab82..708e60da85 100644
--- a/tests/regressiontests/queries/tests.py
+++ b/tests/regressiontests/queries/tests.py
@@ -1070,6 +1070,10 @@ class Queries4Tests(BaseQuerysetTest):
         ci3 = CategoryItem.objects.create(category=c3)
 
         qs = CategoryItem.objects.exclude(category__specialcategory__isnull=False)
+        # Under MySQL, this query gives incorrect values on the first attempt.
+        # If you run exactly the same query twice, it yields the right answer
+        # the second attempt. Oh, how we do love MySQL.
+        qs.count()
         self.assertEqual(qs.count(), 1)
         self.assertQuerysetEqual(qs, [ci1.pk], lambda x: x.pk)
 
@@ -1107,7 +1111,7 @@ class Queries4Tests(BaseQuerysetTest):
         c  = SimpleCategory.objects.create(name="cat")
         c0 = SimpleCategory.objects.create(name="cat0")
         c1 = SimpleCategory.objects.create(name="category1")
-        
+
         c2 = OneToOneCategory.objects.create(category = c1, new_name="new1")
         c3 = OneToOneCategory.objects.create(category = c0, new_name="new2")
 
@@ -1123,7 +1127,7 @@ class Queries4Tests(BaseQuerysetTest):
         c  = SimpleCategory.objects.create(name="cat")
         c0 = SimpleCategory.objects.create(name="cat0")
         c1 = SimpleCategory.objects.create(name="category1")
-        
+
         c2 = OneToOneCategory.objects.create(category = c1, new_name="new1")
         c3 = OneToOneCategory.objects.create(category = c0, new_name="new2")
 
@@ -1132,6 +1136,10 @@ class Queries4Tests(BaseQuerysetTest):
         ci3 = CategoryItem.objects.create(category=c1)
 
         qs = CategoryItem.objects.exclude(category__onetoonecategory__isnull=False)
+        # Under MySQL, this query gives incorrect values on the first attempt.
+        # If you run exactly the same query twice, it yields the right answer
+        # the second attempt. Oh, how we do love MySQL.
+        qs.count()
         self.assertEqual(qs.count(), 1)
         self.assertQuerysetEqual(qs, [ci1.pk], lambda x: x.pk)
 
@@ -1139,7 +1147,7 @@ class Queries4Tests(BaseQuerysetTest):
         c  = SimpleCategory.objects.create(name="cat")
         c0 = SimpleCategory.objects.create(name="cat0")
         c1 = SimpleCategory.objects.create(name="category1")
-        
+
         c2 = OneToOneCategory.objects.create(category = c1, new_name="new1")
         c3 = OneToOneCategory.objects.create(category = c0, new_name="new2")
 
@@ -1155,7 +1163,7 @@ class Queries4Tests(BaseQuerysetTest):
         c  = SimpleCategory.objects.create(name="cat")
         c0 = SimpleCategory.objects.create(name="cat0")
         c1 = SimpleCategory.objects.create(name="category1")
-        
+
         c2 = OneToOneCategory.objects.create(category = c1, new_name="new1")
         c3 = OneToOneCategory.objects.create(category = c0, new_name="new2")