bk commit into 5.0 tree (sergefp:1.1969)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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.1969 05/09/09 12:57:00 sergefp@stripped +3 -0
  Post-merge fixes

  mysql-test/t/group_by.test
    1.53 05/09/09 12:56:56 sergefp@stripped +6 -6
    Post-merge fixes

  mysql-test/r/olap.result
    1.31 05/09/09 12:56:56 sergefp@stripped +1 -0
    Post-merge fixes

  mysql-test/r/group_by.result
    1.65 05/09/09 12:56:56 sergefp@stripped +7 -7
    Post-merge fixes

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-merge

--- 1.30/mysql-test/r/olap.result	2005-09-09 11:44:06 +04:00
+++ 1.31/mysql-test/r/olap.result	2005-09-09 12:56:56 +04:00
@@ -579,6 +579,7 @@
 1	1	1
 2	1	1
 NULL	NULL	2
+DROP TABLE t1;
 CREATE TABLE t1(id int, type char(1));
 INSERT INTO t1 VALUES
 (1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"),

--- 1.64/mysql-test/r/group_by.result	2005-09-09 10:54:54 +04:00
+++ 1.65/mysql-test/r/group_by.result	2005-09-09 12:56:56 +04:00
@@ -751,13 +751,6 @@
 1	NULL
 1	a problem
 DROP TABLE t1, t2;
-create table t1 (f1 date);
-insert into t1 values('2005-06-06');
-insert into t1 values('2005-06-06');
-select date(left(f1+0,8)) from t1 group by 1;
-date(left(f1+0,8))
-2005-06-06
-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;
@@ -766,6 +759,13 @@
 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');
+select date(left(f1+0,8)) from t1 group by 1;
+date(left(f1+0,8))
[phone]
 drop table t1;
 CREATE TABLE t1 (n int);
 INSERT INTO t1 VALUES (1);

--- 1.52/mysql-test/t/group_by.test	2005-09-09 10:54:54 +04:00
+++ 1.53/mysql-test/t/group_by.test	2005-09-09 12:56:56 +04:00
@@ -575,6 +575,12 @@
 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 comment
+  FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment;
+
+DROP TABLE t1, t2;
+
 #
 # BUG#12695: Item_func_isnull::update_used_tables
 # did not update const_item_cache
@@ -584,12 +590,6 @@
 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;
-
-DROP TABLE t1, t2;
-
 
 #
 # Bug #12266 GROUP BY expression on DATE column produces result with