Bug#13358379 EXPLAIN SELECT ... PROCEDURE ANALYZE CRASHES THE SERVER

Problem: code which is realted to PROCEDURE resultpreparation
         is missing in JOIN::explain().
Fix:     code which is related to PROCEDURE result preparation
         is moved into JOIN::prepare_result.

Author: Sergey Glukhov

mysql-test/r/func_analyse.result

@@ -163,3 +163,11 @@ test.t1	analyze	status	OK
 SELECT f1,f2 FROM t1 A WHERE f1 BETWEEN 0 AND 1;
 f1	f2
 drop table t1;
+#
+# Bug #13358379   EXPLAIN SELECT ... PROCEDURE ANALYZE CRASHES THE SERVER
+#
+CREATE TABLE t1 (i INT);
+EXPLAIN SELECT * FROM t1 PROCEDURE ANALYSE();
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1	
+DROP TABLE t1;

mysql-test/t/func_analyse.test

@@ -180,3 +180,11 @@ ANALYZE TABLE t1;
 SELECT f1,f2 FROM t1 A WHERE f1 BETWEEN 0 AND 1; 
 
 drop table t1;
+
+--echo #
+--echo # Bug #13358379   EXPLAIN SELECT ... PROCEDURE ANALYZE CRASHES THE SERVER
+--echo #
+
+CREATE TABLE t1 (i INT);
+EXPLAIN SELECT * FROM t1 PROCEDURE ANALYSE();
+DROP TABLE t1;

sql/sql_select.cc

@@ -2921,7 +2921,7 @@ disable_sorted_access(JOIN_TAB* join_tab)
     FALSE Ok
 */
 
-bool JOIN::prepare_result()
+bool JOIN::prepare_result(List<Item> **columns_list)
 {
   DBUG_ENTER("JOIN::prepare_result");
 
@@ -2936,6 +2936,19 @@ bool JOIN::prepare_result()
       get_schema_tables_result(this, PROCESSED_BY_JOIN_EXEC))
     goto err;
 
+  if (procedure)
+  {
+    procedure_fields_list= fields_list;
+    if (procedure->change_columns(procedure_fields_list) ||
+	result->prepare(procedure_fields_list, unit))
+    {
+      thd->set_examined_row_count(0);
+      thd->limit_found_rows= 0;
+      goto err;
+    }
+    *columns_list= &procedure_fields_list;
+  }
+
   DBUG_RETURN(FALSE);
 
 err:
@@ -2956,12 +2969,12 @@ JOIN::explain()
   Opt_trace_object trace_exec(trace, "join_explain");
   trace_exec.add_select_number(select_lex->select_number);
   Opt_trace_array trace_steps(trace, "steps");
-
+  List<Item> *columns_list= &fields_list;
   DBUG_ENTER("JOIN::explain");
 
   THD_STAGE_INFO(thd, stage_explaining);
 
-  if (prepare_result())
+  if (prepare_result(&columns_list))
     DBUG_VOID_RETURN;
 
   if (!tables_list && (tables || !select_lex->with_sum_func))
@@ -3048,22 +3061,9 @@ JOIN::exec()
 
   THD_STAGE_INFO(thd, stage_executing);
 
-  if (prepare_result())
+  if (prepare_result(&columns_list))
     DBUG_VOID_RETURN;
 
-  if (procedure)
-  {
-    procedure_fields_list= fields_list;
-    if (procedure->change_columns(procedure_fields_list) ||
-	result->prepare(procedure_fields_list, unit))
-    {
-      thd->set_examined_row_count(0);
-      thd->limit_found_rows= 0;
-      DBUG_VOID_RETURN;
-    }
-    columns_list= &procedure_fields_list;
-  }
-
   if (!tables_list && (tables || !select_lex->with_sum_func))
   {                                           // Only test of functions
     if (result->send_result_set_metadata(*columns_list,

sql/sql_select.h

@@ -2066,7 +2066,7 @@ class JOIN :public Sql_alloc
   int optimize();
   void reset();
   void exec();
-  bool prepare_result();
+  bool prepare_result(List<Item> **columns_list);
   void explain();
   bool destroy();
   void restore_tmp();