From 8e7f0fe7850219d8e448c5ac8f8eee182a403ec6 Mon Sep 17 00:00:00 2001
From: "gkodinov/kgeorge@macbook.gmz" <>
Date: Tue, 17 Oct 2006 19:22:13 +0300
Subject: [PATCH] rename of the new members introduced in the fix for bug 21798

---
 sql/sql_select.cc | 16 ++++++++--------
 sql/sql_select.h  |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 2e959560f2f..4da47e87393 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -4956,23 +4956,23 @@ make_simple_join(JOIN *join,TABLE *tmp_table)
     Reuse TABLE * and JOIN_TAB if already allocated by a previous call
     to this function through JOIN::exec (may happen for sub-queries).
   */
-  if (!join->table_cache)
+  if (!join->table_reexec)
   {
-    if (!(join->table_cache= (TABLE**) join->thd->alloc(sizeof(TABLE*))))
+    if (!(join->table_reexec= (TABLE**) join->thd->alloc(sizeof(TABLE*))))
       DBUG_RETURN(TRUE);                        /* purecov: inspected */
     if (join->tmp_join)
-      join->tmp_join->table_cache= join->table_cache;
+      join->tmp_join->table_reexec= join->table_reexec;
   }
-  if (!join->join_tab_cache)
+  if (!join->join_tab_reexec)
   {
-    if (!(join->join_tab_cache=
+    if (!(join->join_tab_reexec=
           (JOIN_TAB*) join->thd->alloc(sizeof(JOIN_TAB))))
       DBUG_RETURN(TRUE);                        /* purecov: inspected */
     if (join->tmp_join)
-      join->tmp_join->join_tab_cache= join->join_tab_cache;
+      join->tmp_join->join_tab_reexec= join->join_tab_reexec;
   }
-  tableptr= join->table_cache;
-  join_tab= join->join_tab_cache;
+  tableptr= join->table_reexec;
+  join_tab= join->join_tab_reexec;
 
   join->join_tab=join_tab;
   join->table=tableptr; tableptr[0]=tmp_table;
diff --git a/sql/sql_select.h b/sql/sql_select.h
index e1ae8677a6e..30b8f834ddf 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -290,8 +290,8 @@ public:
     excessive memory usage.
   */  
   SORT_FIELD *sortorder;                        // make_unireg_sortorder()
-  TABLE **table_cache;                          // make_simple_join()
-  JOIN_TAB *join_tab_cache;                     // make_simple_join()
+  TABLE **table_reexec;                         // make_simple_join()
+  JOIN_TAB *join_tab_reexec;                    // make_simple_join()
   /* end of allocation caching storage */
 
   JOIN(THD *thd_arg, List<Item> &fields_arg, ulonglong select_options_arg,
@@ -320,8 +320,8 @@ public:
     exec_tmp_table1= 0;
     exec_tmp_table2= 0;
     sortorder= 0;
-    table_cache= 0;
-    join_tab_cache= 0;
+    table_reexec= 0;
+    join_tab_reexec= 0;
     thd= thd_arg;
     sum_funcs= sum_funcs2= 0;
     procedure= 0;