bk commit into 4.1 tree (gkodinov:1.2532) BUG#16792

[kgeorge]

Below is the list of changes that have just been committed into a local
4.1 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-08-10 16:45:02+03:00, gkodinov@stripped +6 -0
  Bug #16792 query with subselect, join, and group not returning proper values
   Treat queries with no FROM and aggregate functions as normal queries,
  so the aggregate function get correctly calculated as if there is 1 row. 
  This means that they will be considered to have one row, so COUNT(*) will return
  1 instead of 0. Other aggregates will behave in compatible manner.

  mysql-test/r/func_gconcat.result@stripped, 2006-08-10 16:44:52+03:00, gkodinov@stripped
+2 -2
    Bug #16792 query with subselect, join, and group not returning proper values
     - test case. Note how it improves the support for DUAL.

  mysql-test/r/func_group.result@stripped, 2006-08-10 16:44:53+03:00, gkodinov@stripped +20
-4
    Bug #16792 query with subselect, join, and group not returning proper values
     - test case. Note how it improves the support for DUAL.

  mysql-test/r/subselect.result@stripped, 2006-08-10 16:44:53+03:00, gkodinov@stripped +2
-2
    Bug #16792 query with subselect, join, and group not returning proper values
     - consequence of (SELECT MAX(<const>)) now returning <const> instead of 0

  mysql-test/t/func_group.test@stripped, 2006-08-10 16:44:54+03:00, gkodinov@stripped +14
-0
    Bug #16792 query with subselect, join, and group not returning proper values
     - test case.

  sql/opt_sum.cc@stripped, 2006-08-10 16:44:55+03:00, gkodinov@stripped +2 -2
    Bug #16792 query with subselect, join, and group not returning proper values
     - cannot do the optimization if the index is already opened by (say) UPDATE
       as it invloves opening reading and closing the index.

  sql/sql_select.cc@stripped, 2006-08-10 16:44:55+03:00, gkodinov@stripped +15 -5
    Bug #16792 query with subselect, join, and group not returning proper values
     - Treat queries with no FROM and aggregate functions as normal queries,
    so the aggregate function get correctly calculated as if there is 1 row. 

# 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-4.1-opt

--- 1.48/sql/opt_sum.cc	2006-08-10 16:45:15 +03:00
+++ 1.49/sql/opt_sum.cc	2006-08-10 16:45:15 +03:00
@@ -182,7 +182,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))
           {
@@ -269,7 +269,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.464/sql/sql_select.cc	2006-08-10 16:45:15 +03:00
+++ 1.465/sql/sql_select.cc	2006-08-10 16:45:15 +03:00
@@ -1131,7 +1131,7 @@ JOIN::exec()
     DBUG_VOID_RETURN;
   }
 
-  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,
@@ -1170,7 +1170,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)
   {
@@ -1209,7 +1214,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;
   }
 
@@ -6028,9 +6034,12 @@ do_select(JOIN *join,List<Item> *fields,
     else
       end_select=end_send;
   }
-  join->join_tab[join->tables-1].next_select=end_select;
+  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)
   {
@@ -6048,6 +6057,7 @@ do_select(JOIN *join,List<Item> *fields,
   }
   else
   {
+    DBUG_ASSERT(join_tab);
     error= sub_select(join,join_tab,0);
     if (error >= 0)
       error= sub_select(join,join_tab,1);

--- 1.180/mysql-test/r/subselect.result	2006-08-10 16:45:15 +03:00
+++ 1.181/mysql-test/r/subselect.result	2006-08-10 16:45:15 +03:00
@@ -1001,7 +1001,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;
@@ -1193,7 +1193,7 @@ UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM 
 ERROR 42S02: Unknown table 't' in field list
 select * from t1;
 i
-1
+3
 drop table t1;
 CREATE TABLE t1 (
 id int(11) default NULL

--- 1.41/mysql-test/r/func_group.result	2006-08-10 16:45:15 +03:00
+++ 1.42/mysql-test/r/func_group.result	2006-08-10 16:45:15 +03:00
@@ -794,7 +794,7 @@ min(7)
 NULL
 select min(7) from DUAL;
 min(7)
-NULL
+7
 explain select min(7) from t2m join t1m;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
@@ -809,7 +809,7 @@ max(7)
 NULL
 select max(7) from DUAL;
 max(7)
-NULL
+7
 explain select max(7) from t2m join t1m;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
@@ -848,7 +848,7 @@ min(7)
 NULL
 select min(7) from DUAL;
 min(7)
-NULL
+7
 explain select min(7) from t2i join t1i;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1	
@@ -864,7 +864,7 @@ max(7)
 NULL
 select max(7) from DUAL;
 max(7)
-NULL
+7
 explain select max(7) from t2i join t1i;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2i	ALL	NULL	NULL	NULL	NULL	1	
@@ -941,4 +941,20 @@ xxxxbbbb
 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;

--- 1.33/mysql-test/t/func_group.test	2006-08-10 16:45:15 +03:00
+++ 1.34/mysql-test/t/func_group.test	2006-08-10 16:45:15 +03:00
@@ -617,4 +617,18 @@ 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.46/mysql-test/r/func_gconcat.result	2006-08-10 16:45:15 +03:00
+++ 1.47/mysql-test/r/func_gconcat.result	2006-08-10 16:45:15 +03:00
@@ -559,14 +559,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));