bk commit into 5.0 tree (igor:1.1974) BUG#11295

[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.1974 05/06/21 08:15:49 igor@stripped +2 -0
  group_by.result, group_by.test:
    Correction for the test case of bug #11295 to remove
    warning.

  mysql-test/r/group_by.result
    1.56 05/06/21 08:15:22 igor@stripped +3 -3
    Correction for the test case of bug #11295 to remove
    warning.

  mysql-test/t/group_by.test
    1.43 05/06/21 08:14:16 igor@stripped +2 -2
    Correction for the test case of bug #11295 to remove
    warning.

# 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-0

--- 1.55/mysql-test/r/group_by.result	Tue Jun 21 06:25:57 2005
+++ 1.56/mysql-test/r/group_by.result	Tue Jun 21 08:15:22 2005
@@ -745,9 +745,9 @@
 INSERT INTO t1 VALUES ('trans1'), ('trans2');
 CREATE TABLE t2 (id varchar(20) NOT NULL, err_comment blob NOT NULL);
 INSERT INTO t2 VALUES ('trans1', 'a problem');
-SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS err_comment
-FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY err_comment;
-COUNT(DISTINCT(t1.id))	err_comment
+SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment
+FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;
+COUNT(DISTINCT(t1.id))	comment
 1	NULL
 1	a problem
 DROP TABLE t1, t2;

--- 1.42/mysql-test/t/group_by.test	Tue Jun 21 06:25:57 2005
+++ 1.43/mysql-test/t/group_by.test	Tue Jun 21 08:14:16 2005
@@ -576,7 +576,7 @@
 CREATE TABLE t2 (id varchar(20) NOT NULL, err_comment blob NOT NULL);
 INSERT INTO t2 VALUES ('trans1', 'a problem');
 
-SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS err_comment
-  FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY err_comment;
+SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment
+  FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;
 
 DROP TABLE t1, t2;