bk commit into 5.0 tree (serg:1.1972)

[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.1972 05/09/09 12:47:57 serg@stripped +1 -0
  aftermerge

  mysql-test/r/group_by.result
    1.68 05/09/09 12:47:45 serg@stripped +9 -9
    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.67/mysql-test/r/group_by.result	Fri Sep  9 12:43:14 2005
+++ 1.68/mysql-test/r/group_by.result	Fri Sep  9 12:47:45 2005
@@ -751,15 +751,6 @@ COUNT(DISTINCT(t1.id))	comment
 1	NULL
 1	a problem
 DROP TABLE t1, t2;
-create table t1(f1 varchar(5) key);
-insert into t1 values (1),(2);
-select sql_buffer_result max(f1) is null from t1;
-max(f1) is null
-0
-select sql_buffer_result max(f1)+1 from t1;
-max(f1)+1
-3
-drop table t1;
 create table t1 (f1 date);
 insert into t1 values('2005-06-06');
 insert into t1 values('2005-06-06');
@@ -775,6 +766,15 @@ n
 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;
+max(f1) is null
+0
+select sql_buffer_result max(f1)+1 from t1;
+max(f1)+1
+3
+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');