From: Date: April 26 2007 4:39pm
Subject: bk commit into 5.0 tree (gkodinov:1.2440) BUG#27807
List-Archive: http://lists.mysql.com/commits/25516
X-Bug: 27807
Message-Id: <200704261439.l3QEdSWZ001602@magare.gmz>

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-26 17:39:22+03:00, gkodinov@stripped +5 -0
  Bug #27807.
  Non-correlated scalar subqueries may get executed
  in EXPLAIN at the optimization phase if they are
  part of a right hand sargable expression.
  If the scalar subquery uses a temp table to 
  materialize its results it will replace the 
  subquery structure from the parser with a simple
  select from the materialization table.
  As a result the EXPLAIN will crash as the 
  temporary materialization table is not to be shown
  in EXPLAIN at all.
  Fixed by preserving the original query structure
  right after calling optimize() for scalar subqueries
  with temp tables executed during EXPLAIN.

  mysql-test/r/subselect.result@stripped, 2007-04-26 17:39:21+03:00, gkodinov@stripped +8 -0
    Bug #27807: test case

  mysql-test/t/subselect.test@stripped, 2007-04-26 17:39:21+03:00, gkodinov@stripped +9 -0
    Bug #27807: test case

  sql/item_subselect.cc@stripped, 2007-04-26 17:39:21+03:00, gkodinov@stripped +15 -0
    Bug #27807: preserve the join structure

  sql/sql_select.cc@stripped, 2007-04-26 17:39:21+03:00, gkodinov@stripped +15 -8
    Bug #27807: introduce initialization function for tmp_join

  sql/sql_select.h@stripped, 2007-04-26 17:39:21+03:00, gkodinov@stripped +1 -0
    Bug #27807: introduce initialization function for tmp_join

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	magare.gmz
# Root:	/home/kgeorge/mysql/work/B27807-5.0-opt

--- 1.511/sql/sql_select.cc	2007-04-21 19:27:34 +03:00
+++ 1.512/sql/sql_select.cc	2007-04-26 17:39:21 +03:00
@@ -1426,14 +1426,9 @@ JOIN::optimize()
       }
     }
 
-    if (select_lex->uncacheable && !is_top_level_join())
-    {
-      /* If this join belongs to an uncacheable subquery */
-      if (!(tmp_join= (JOIN*)thd->alloc(sizeof(JOIN))))
-	DBUG_RETURN(-1);
-      error= 0;				// Ensure that tmp_join.error= 0
-      restore_tmp();
-    }
+    if (select_lex->uncacheable && !is_top_level_join() &&
+        init_save_join_tab())
+      DBUG_RETURN(-1);
   }
 
   error= 0;
@@ -1493,6 +1488,18 @@ JOIN::reinit()
   }
 
   DBUG_RETURN(0);
+}
+
+
+bool
+JOIN::init_save_join_tab()
+{
+  /* If this join belongs to an uncacheable subquery */
+  if (!(tmp_join= (JOIN*)thd->alloc(sizeof(JOIN))))
+    return 1;
+  error= 0;				// Ensure that tmp_join.error= 0
+  restore_tmp();
+  return 0;
 }
 
 

--- 1.117/sql/sql_select.h	2007-03-22 18:49:45 +02:00
+++ 1.118/sql/sql_select.h	2007-04-26 17:39:21 +03:00
@@ -434,6 +434,7 @@ public:
   void cleanup(bool full);
   void clear();
   bool save_join_tab();
+  bool init_save_join_tab();
   bool send_row_on_empty_set()
   {
     return (do_send_rows && tmp_table_param.sum_func_count != 0 &&

--- 1.185/mysql-test/r/subselect.result	2007-04-20 13:26:57 +03:00
+++ 1.186/mysql-test/r/subselect.result	2007-04-26 17:39:21 +03:00
@@ -4012,3 +4012,11 @@ WHERE (SELECT COUNT(t0.b) FROM t1 t WHER
 ERROR HY000: Invalid use of group function
 SET @@sql_mode=default;
 DROP TABLE t1;
+CREATE TABLE t1 (a int, b int, KEY (a));
+INSERT INTO t1 VALUES (1,1),(2,1);
+EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT COUNT(*) FROM t1 GROUP BY b);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ref	a	a	5	const	1	Using where; Using index
+2	SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	2	Using temporary; Using filesort
+DROP TABLE t1;
+End of 5.0 tests.

--- 1.149/mysql-test/t/subselect.test	2007-04-15 08:22:35 +03:00
+++ 1.150/mysql-test/t/subselect.test	2007-04-26 17:39:21 +03:00
@@ -2845,3 +2845,12 @@ SELECT a FROM t1 t0
 SET @@sql_mode=default;
 
 DROP TABLE t1;
+
+#
+# Bug #27807: Server crash when executing subquery with EXPLAIN
+#  
+CREATE TABLE t1 (a int, b int, KEY (a)); INSERT INTO t1 VALUES (1,1),(2,1);
+EXPLAIN SELECT 1 FROM t1 WHERE a = (SELECT COUNT(*) FROM t1 GROUP BY b);
+DROP TABLE t1;
+
+--echo End of 5.0 tests.

--- 1.155/sql/item_subselect.cc	2007-03-28 20:46:37 +03:00
+++ 1.156/sql/item_subselect.cc	2007-04-26 17:39:21 +03:00
@@ -1774,6 +1774,21 @@ int subselect_single_select_engine::exec
       thd->lex->current_select= save_select;
       DBUG_RETURN(join->error ? join->error : 1);
     }
+    if (!select_lex->uncacheable && thd->lex->describe && 
+        !(join->select_options & SELECT_DESCRIBE) && 
+        join->need_tmp && item->const_item())
+    {
+      /*
+        Force join->join_tmp creation, because this subquery will be replaced
+        by a simple select from the materialization temp table by optimize()
+        called by EXPLAIN and we need to preserve the initial query structure
+        so we can display it.
+       */
+      select_lex->uncacheable|= UNCACHEABLE_EXPLAIN;
+      select_lex->master_unit()->uncacheable|= UNCACHEABLE_EXPLAIN;
+      if (join->init_save_join_tab())
+        DBUG_RETURN(1);
+    }
     if (item->engine_changed)
     {
       DBUG_RETURN(1);