bk commit into 5.0 tree (evgen:1.1945)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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.1945 05/08/05 13:51:48 evgen@stripped +3 -0
  Manual merge bug fix #12266

  mysql-test/t/group_by.test
    1.50 05/08/05 13:51:46 evgen@stripped +10 -10
    Manual merge

  mysql-test/r/group_by.result
    1.62 05/08/05 13:51:46 evgen@stripped +7 -7
    Manual merge

  sql/item_timefunc.h
    1.56 05/08/05 13:34:21 evgen@stripped +0 -0
    Auto merged

# 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:	evgen
# Host:	moonbone.local
# Root:	/work/mysql-5.0-bug-12266/RESYNC

--- 1.55/sql/item_timefunc.h	2005-07-01 08:05:35 +04:00
+++ 1.56/sql/item_timefunc.h	2005-08-05 13:34:21 +04:00
@@ -714,6 +714,12 @@
   {
     return (new Field_date(maybe_null, name, t_arg, &my_charset_bin));
   }  
+  void fix_length_and_dec()
+  {
+    collation.set(&my_charset_bin);
+    max_length= 10;
+    maybe_null= 1;
+  }
 };
 
 

--- 1.61/mysql-test/r/group_by.result	2005-07-04 17:00:55 +04:00
+++ 1.62/mysql-test/r/group_by.result	2005-08-05 13:51:46 +04:00
@@ -780,3 +780,10 @@
 show warnings;
 Level	Code	Message
 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))
[phone]
+drop table t1;

--- 1.49/mysql-test/t/group_by.test	2005-07-28 18:09:48 +04:00
+++ 1.50/mysql-test/t/group_by.test	2005-08-05 13:51:46 +04:00
@@ -617,3 +617,13 @@
 show warnings;
 drop table t1, t2;
 
+#
+# Bug #12266 GROUP BY expression on DATE column produces result with
+#            reduced length
+#
+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;
+drop table t1;
+