bk commit into 5.0 tree (gkodinov:1.2258)

[kgeorge]

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, 2006-09-05 17:09:12+03:00, gkodinov@stripped +6 -0
  Merge macbook.gmz:/Users/kgeorge/mysql/work/B16792-4.1-opt
  into  macbook.gmz:/Users/kgeorge/mysql/work/B16792-5.0-opt
  MERGE: 1.1616.2698.2

  mysql-test/r/func_gconcat.result@stripped, 2006-09-05 16:27:14+03:00, gkodinov@stripped
+0 -0
    Auto merged
    MERGE: 1.27.1.20

  mysql-test/r/func_group.result@stripped, 2006-09-05 17:09:04+03:00, gkodinov@stripped +0
-4
    merge 4.1->5.0 for bug #16792
    MERGE: 1.22.7.2

  mysql-test/r/subselect.result@stripped, 2006-09-05 16:27:15+03:00, gkodinov@stripped +0
-0
    Auto merged
    MERGE: 1.67.1.114

  mysql-test/t/func_group.test@stripped, 2006-09-05 17:09:04+03:00, gkodinov@stripped +8 -9
    merge 4.1->5.0 for bug #16792
    MERGE: 1.24.3.1

  sql/opt_sum.cc@stripped, 2006-09-05 16:27:16+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.33.6.2

  sql/sql_select.cc@stripped, 2006-09-05 17:09:05+03:00, gkodinov@stripped +5 -5
    merge 4.1->5.0 for bug #16792
    MERGE: 1.216.125.16

# 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:	macbook.gmz
# Root:	/Users/kgeorge/mysql/work/B16792-5.0-opt/RESYNC

--- 1.57/sql/opt_sum.cc	2006-09-05 17:09:30 +03:00
+++ 1.58/sql/opt_sum.cc	2006-09-05 17:09:30 +03:00
@@ -191,7 +191,7 @@ int opt_sum_query(TABLE_LIST *tables, Li
             Type of range for the key part for this field will be
             returned in range_fl.
           */
-          if ((outer_tables & table->map) ||
+          if (table->file->inited || (outer_tables & table->map) ||
               !find_key_for_maxmin(0, &ref, item_field->field, conds,
                                    &range_fl, &prefix_len))
           {
@@ -278,7 +278,7 @@ int opt_sum_query(TABLE_LIST *tables, Li
             Type of range for the key part for this field will be
             returned in range_fl.
           */
-          if ((outer_tables & table->map) ||
+          if (table->file->inited || (outer_tables & table->map) ||
 	          !find_key_for_maxmin(1, &ref, item_field->field, conds,
 				                   &range_fl, &prefix_len))
           {

--- 1.448/sql/sql_select.cc	2006-09-05 17:09:31 +03:00
+++ 1.449/sql/sql_select.cc	2006-09-05 17:09:31 +03:00
@@ -1324,7 +1324,7 @@ JOIN::exec()
   }
   (void) result->prepare2(); // Currently, this cannot fail.
 
-  if (!tables_list)
+  if (!tables_list && (tables || !select_lex->with_sum_func))
   {                                           // Only test of functions
     if (select_options & SELECT_DESCRIBE)
       select_describe(this, FALSE, FALSE, FALSE,
@@ -1364,7 +1364,12 @@ JOIN::exec()
     thd->examined_row_count= 0;
     DBUG_VOID_RETURN;
   }
-  thd->limit_found_rows= thd->examined_row_count= 0;
+  /* 
+    don't reset the found rows count if there're no tables
+    as FOUND_ROWS() may be called.
+  */  
+  if (tables)
+    thd->limit_found_rows= thd->examined_row_count= 0;
 
   if (zero_result_cause)
   {
@@ -1403,7 +1408,8 @@ JOIN::exec()
     having= tmp_having;
     select_describe(this, need_tmp,
 		    order != 0 && !skip_sort_order,
-		    select_distinct);
+		    select_distinct,
+                    !tables ? "No tables used" : NullS);
     DBUG_VOID_RETURN;
   }
 
@@ -9728,9 +9734,13 @@ do_select(JOIN *join,List<Item> *fields,
       table->file->ha_index_init(0);
   }
   /* Set up select_end */
-  join->join_tab[join->tables-1].next_select= setup_end_select_func(join);
+  Next_select_func end_select= setup_end_select_func(join);
+  if (join->tables)
+  {
+    join->join_tab[join->tables-1].next_select= end_select;
 
-  join_tab=join->join_tab+join->const_tables;
+    join_tab=join->join_tab+join->const_tables;
+  }
   join->send_records=0;
   if (join->tables == join->const_tables)
   {
@@ -9740,7 +9750,6 @@ do_select(JOIN *join,List<Item> *fields,
     */
     if (!join->conds || join->conds->val_int())
     {
-      Next_select_func end_select= join->join_tab[join->tables-1].next_select;
       error= (*end_select)(join,join_tab,0);
       if (error == NESTED_LOOP_OK || error == NESTED_LOOP_QUERY_LIMIT)
 	error= (*end_select)(join,join_tab,1);
@@ -9754,6 +9763,8 @@ do_select(JOIN *join,List<Item> *fields,
   }
   else
   {
+    DBUG_ASSERT(join->tables);
+    DBUG_ASSERT(join_tab);
     error= sub_select(join,join_tab,0);
     if (error == NESTED_LOOP_OK || error == NESTED_LOOP_NO_MORE_ROWS)
       error= sub_select(join,join_tab,1);

--- 1.155/mysql-test/r/subselect.result	2006-09-05 17:09:31 +03:00
+++ 1.156/mysql-test/r/subselect.result	2006-09-05 17:09:31 +03:00
@@ -1011,7 +1011,7 @@ INSERT INTO t1 VALUES (1);
 UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
 select * from t1;
 i
-1
+2
 drop table t1;
 CREATE TABLE t1 (a int(1));
 EXPLAIN EXTENDED SELECT (SELECT RAND() FROM t1) FROM t1;
@@ -1203,7 +1203,7 @@ UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM 
 ERROR 42S22: Unknown column 't.i' in 'field list'
 select * from t1;
 i
-1
+3
 drop table t1;
 CREATE TABLE t1 (
 id int(11) default NULL

--- 1.49/mysql-test/r/func_group.result	2006-09-05 17:09:31 +03:00
+++ 1.50/mysql-test/r/func_group.result	2006-09-05 17:09:31 +03:00
@@ -845,6 +845,22 @@ EXPLAIN SELECT MAX(b) FROM t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	
 DROP TABLE t1;
+CREATE TABLE t1 (a INT, b INT);
+INSERT INTO t1 VALUES (1,1),(1,2),(2,3);
+SELECT (SELECT COUNT(DISTINCT t1.b)) FROM t1 GROUP BY t1.a;
+(SELECT COUNT(DISTINCT t1.b))
+1
+1
+SELECT (SELECT COUNT(DISTINCT 12)) FROM t1 GROUP BY t1.a;
+(SELECT COUNT(DISTINCT 12))
+1
+1
+SELECT AVG(2), BIT_AND(2), BIT_OR(2), BIT_XOR(2), COUNT(*), COUNT(12),
+COUNT(DISTINCT 12), MIN(2),MAX(2),STD(2), VARIANCE(2),SUM(2),
+GROUP_CONCAT(2),GROUP_CONCAT(DISTINCT 2);
+AVG(2)	BIT_AND(2)	BIT_OR(2)	BIT_XOR(2)	COUNT(*)	COUNT(12)	COUNT(DISTINCT
12)	MIN(2)	MAX(2)	STD(2)	VARIANCE(2)	SUM(2)	GROUP_CONCAT(2)	GROUP_CONCAT(DISTINCT 2)
+2.0000	2	2	2	1	1	1	2	2	0.0000	0.0000	2	2	2
+DROP TABLE t1;
 CREATE TABLE t1 (id int , b varchar(512), INDEX(b(250))) COLLATE latin1_bin;
 INSERT INTO t1 VALUES
 (1,CONCAT(REPEAT('_', 250), "qq")), (1,CONCAT(REPEAT('_', 250), "zz")),

--- 1.48/mysql-test/t/func_group.test	2006-09-05 17:09:31 +03:00
+++ 1.49/mysql-test/t/func_group.test	2006-09-05 17:09:31 +03:00
@@ -566,6 +566,19 @@ INSERT INTO t1 VALUES
 SELECT MAX(b) FROM t1;
 EXPLAIN SELECT MAX(b) FROM t1;
 DROP TABLE t1;
+#
+# Bug #16792  query with subselect, join, and group not returning proper values
+#
+CREATE TABLE t1 (a INT, b INT);
+INSERT INTO t1 VALUES (1,1),(1,2),(2,3);
+
+SELECT (SELECT COUNT(DISTINCT t1.b)) FROM t1 GROUP BY t1.a;
+SELECT (SELECT COUNT(DISTINCT 12)) FROM t1 GROUP BY t1.a;
+# an attempt to test all aggregate function with no table.
+SELECT AVG(2), BIT_AND(2), BIT_OR(2), BIT_XOR(2), COUNT(*), COUNT(12),
+       COUNT(DISTINCT 12), MIN(2),MAX(2),STD(2), VARIANCE(2),SUM(2),
+       GROUP_CONCAT(2),GROUP_CONCAT(DISTINCT 2);
+DROP TABLE t1;
 
 # End of 4.1 tests
 

--- 1.59/mysql-test/r/func_gconcat.result	2006-09-05 17:09:31 +03:00
+++ 1.60/mysql-test/r/func_gconcat.result	2006-09-05 17:09:31 +03:00
@@ -566,14 +566,14 @@ COUNT(*)	GROUP_CONCAT(DISTINCT t2.somena
 DROP TABLE t1,t2;
 select * from (select group_concat('c') from DUAL) t;
 group_concat('c')
-NULL
+c
 create table t1 ( a int not null default 0);
 select * from (select group_concat(a) from t1) t2;
 group_concat(a)
 NULL
 select group_concat('x') UNION ALL select 1;
 group_concat('x')
-NULL
+x
 1
 drop table t1;
 CREATE TABLE t1 (id int, a varchar(9));