From 11b2cf4f03b7c4b84c26d3c95cdf6f8fa6322349 Mon Sep 17 00:00:00 2001
From: Tor Didriksen <tor.didriksen@oracle.com>
Date: Wed, 18 Apr 2012 13:14:05 +0200
Subject: Backport 5.5=>5.1 Patch for Bug#13805127: Stored program cache
 produces wrong result in same THD.

---
 sql/sql_prepare.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'sql/sql_prepare.cc')

diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 98379dba9ba..27e70aaf843 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -2361,6 +2361,14 @@ void reinit_stmt_before_use(THD *thd, LEX *lex)
       DBUG_ASSERT(sl->join == 0);
       ORDER *order;
       /* Fix GROUP list */
+      if (sl->group_list_ptrs && sl->group_list_ptrs->size() > 0)
+      {
+        for (uint ix= 0; ix < sl->group_list_ptrs->size() - 1; ++ix)
+        {
+          order= sl->group_list_ptrs->at(ix);
+          order->next= sl->group_list_ptrs->at(ix+1);
+        }
+      }
       for (order= sl->group_list.first; order; order= order->next)
         order->item= &order->item_ptr;
       /* Fix ORDER list */
-- 
cgit v1.2.1