bk commit into 5.0 tree (serg:1.1970)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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.1970 05/09/09 12:15:25 serg@stripped +2 -0
  aftermerge

  mysql-test/t/group_by.test
    1.54 05/09/09 12:14:50 serg@stripped +0 -10
    aftermerge

  mysql-test/r/group_by.result
    1.66 05/09/09 12:14:48 serg@stripped +8 -8
    aftermerge

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.65/mysql-test/r/group_by.result	Fri Sep  9 10:48:52 2005
+++ 1.66/mysql-test/r/group_by.result	Fri Sep  9 12:14:48 2005
@@ -758,6 +758,14 @@ select date(left(f1+0,8)) from t1 group 
 date(left(f1+0,8))
 2005-06-06
 drop table t1;
+CREATE TABLE t1 (n int);
+INSERT INTO t1 VALUES (1);
+SELECT n+1 AS n FROM t1 GROUP BY n;
+n
+2
+Warnings:
+Warning	1052	Column 'n' in group statement is ambiguous
+DROP TABLE t1;
 create table t1(f1 varchar(5) key);
 insert into t1 values (1),(2);
 select sql_buffer_result max(f1) is null from t1;
@@ -767,14 +775,6 @@ select sql_buffer_result max(f1)+1 from 
 max(f1)+1
 3
 drop table t1;
-CREATE TABLE t1 (n int);
-INSERT INTO t1 VALUES (1);
-SELECT n+1 AS n FROM t1 GROUP BY n;
-n
-2
-Warnings:
-Warning	1052	Column 'n' in group statement is ambiguous
-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');

--- 1.53/mysql-test/t/group_by.test	Fri Sep  9 10:48:53 2005
+++ 1.54/mysql-test/t/group_by.test	Fri Sep  9 12:14:50 2005
@@ -575,16 +575,6 @@ CREATE TABLE t1 (id varchar(20) NOT NULL
 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');
-#
-# BUG#12695: Item_func_isnull::update_used_tables
-# did not update const_item_cache
-#
-create table t1(f1 varchar(5) key);
-insert into t1 values (1),(2);
-select sql_buffer_result max(f1) is null from t1;
-select sql_buffer_result max(f1)+1 from t1;
-drop table t1;
-
 SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment
   FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;