bk commit into 5.0 tree (igor:1.1965) BUG#12885

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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
  1.1965 05/09/08 15:45:31 igor@stripped +2 -0
  olap.result, olap.test:
    Added a test case with VIEW for bug #12885.

  mysql-test/r/olap.result
    1.29 05/09/08 15:44:51 igor@stripped +16 -0
    Added a test case with VIEW for bug #12885.

  mysql-test/t/olap.test
    1.23 05/09/08 15:44:12 igor@stripped +17 -2
    Added a test case with VIEW for bug #12885.

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-5.0-1

--- 1.28/mysql-test/r/olap.result	Thu Sep  8 13:44:31 2005
+++ 1.29/mysql-test/r/olap.result	Thu Sep  8 15:44:51 2005
@@ -602,3 +602,19 @@
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	10	Using filesort
 DROP VIEW v1;
 DROP TABLE t1;
+CREATE TABLE t1 (a int(11) NOT NULL);
+INSERT INTO t1 VALUES (1),(2);
+CREATE VIEW v1 AS
+SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP;
+DESC v1;
+Field	Type	Null	Key	Default	Extra
+a	bigint(11)	YES		NULL	
+LENGTH(a)	bigint(10)	YES		NULL	
+COUNT(*)	bigint(21)	NO		0	
+SELECT * FROM v1;
+a	LENGTH(a)	COUNT(*)
+1	1	1
+2	1	1
+NULL	NULL	2
+DROP VIEW v1;
+DROP TABLE t1;

--- 1.22/mysql-test/t/olap.test	Thu Sep  8 13:45:44 2005
+++ 1.23/mysql-test/t/olap.test	Thu Sep  8 15:44:12 2005
@@ -263,8 +263,8 @@
 DROP TABLE t1;
 
 #
-# Bug #11885:  derived table specified by a subquery with
-#              ROLLUP over expressions on not nullable group by attributes 
+# Bug #12885(1): derived table specified by a subquery with
+#                ROLLUP over expressions on not nullable group by attributes 
 #
 
 CREATE TABLE t1 (a int(11) NOT NULL);
@@ -294,4 +294,19 @@
 DROP VIEW v1;
 DROP TABLE t1;
 
+#
+# Bug #12885(2): view specified by a subquery with
+#                ROLLUP over expressions on not nullable group by attributes 
+#
+
+CREATE TABLE t1 (a int(11) NOT NULL);
+INSERT INTO t1 VALUES (1),(2);
 
+CREATE VIEW v1 AS
+  SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP;
+
+DESC v1;
+SELECT * FROM v1;
+
+DROP VIEW v1;
+DROP TABLE t1;