From f4dd6831f5863ea5f239ca24c5b3c03bd2575c4a Mon Sep 17 00:00:00 2001
From: Sergey Petrunya <psergey@askmonty.org>
Date: Fri, 26 Aug 2011 16:04:30 +0400
Subject: [PATCH] Fix for previous csets: let set_explain_type() produce
 correct types for "UNION RESULT" selects

---
 sql/sql_lex.cc    | 2 +-
 sql/sql_select.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 454331a0859..82b171789bc 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -3520,7 +3520,7 @@ void st_select_lex::set_explain_type()
           ((is_uncacheable & UNCACHEABLE_DEPENDENT) ?
            "DEPENDENT UNION":
            is_uncacheable ? "UNCACHEABLE UNION":
-           "UNION")));
+           (this == master_unit()->fake_select_lex)? "UNION RESULT" : "UNION")));
   options|= SELECT_DESCRIBE;
 }
 
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c3d1543b363..55ca42f797b 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -20503,7 +20503,7 @@ int JOIN::print_explain(select_result_sink *result, bool on_the_fly,
            join->select_lex->master_unit()->derived->is_materialized_derived())
   {
     table_map used_tables=0;
-    join->select_lex->set_explain_type(); //psergey
+    join->select_lex->set_explain_type(); //psergey-todo: this adds SELECT_DESCRIBE to options! bad for on-the-fly 
 
     bool printing_materialize_nest= FALSE;
     uint select_id= join->select_lex->select_number;