bk commit into 5.0 tree (igor:1.1956) BUG#8614

[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.1956 05/06/16 11:59:00 igor@stripped +2 -0
  group_by.result, group_by.test:
    Correction after merge of fix for bug #8614.

  mysql-test/r/group_by.result
    1.53 05/06/16 11:58:35 igor@stripped +2 -6
    Correction after merge of fix for bug #8614.

  mysql-test/t/group_by.test
    1.40 05/06/16 11:57:43 igor@stripped +0 -1
    Correction after merge of fix for bug #8614.

# 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.52/mysql-test/r/group_by.result	Thu Jun 16 10:04:36 2005
+++ 1.53/mysql-test/r/group_by.result	Thu Jun 16 11:58:35 2005
@@ -721,11 +721,8 @@
 WHERE hostname LIKE '%aol%'
     GROUP BY hostname;
 hostname	no
-cache-dtc-af05.proxy.aol.com
-DROP TABLE t1;	1
-drop table if exists t1, t2;
-Warnings:
-Note	1051	Unknown table 't2'
+cache-dtc-af05.proxy.aol.com	1
+DROP TABLE t1;
 create table t1 (c1 char(3), c2 char(3));
 create table t2 (c3 char(3), c4 char(3));
 insert into t1 values ('aaa', 'bb1'), ('aaa', 'bb2');
@@ -747,7 +744,6 @@
 show warnings;
 Level	Code	Message
 drop table t1, t2;
-DROP TABLE t1;
 CREATE TABLE t1 (a  int, b int);
 INSERT INTO t1 VALUES (1,2), (1,3);
 SELECT a, b FROM t1 GROUP BY 'const';

--- 1.39/mysql-test/t/group_by.test	Thu Jun 16 10:04:36 2005
+++ 1.40/mysql-test/t/group_by.test	Thu Jun 16 11:57:43 2005
@@ -546,7 +546,6 @@
 # Bug#11211: Ambiguous column reference in GROUP BY.
 #
 
-drop table if exists t1, t2;
 create table t1 (c1 char(3), c2 char(3));
 create table t2 (c3 char(3), c4 char(3));
 insert into t1 values ('aaa', 'bb1'), ('aaa', 'bb2');