bk commit into 5.1 tree (holyfoot:1.2326)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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@stripped, 2006-11-09 16:10:15+04:00, holyfoot@deer.(none) +3 -0
  Merge bk@stripped:mysql-5.1-opt
  into  mysql.com:/home/hf/work/8663/my51-8663
  MERGE: 1.2324.1.6

  mysql-test/r/type_newdecimal.result@stripped, 2006-11-09 16:10:09+04:00, holyfoot@deer.(none) +0 -0
    Auto merged
    MERGE: 1.49.1.1

  mysql-test/t/type_newdecimal.test@stripped, 2006-11-09 16:10:09+04:00, holyfoot@deer.(none) +6 -0
    Auto merged
    MERGE: 1.42.1.1

  sql/item_func.cc@stripped, 2006-11-09 16:10:09+04:00, holyfoot@deer.(none) +0 -0
    Auto merged
    MERGE: 1.322.1.1

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/8663/my51-8663/RESYNC

--- 1.323/sql/item_func.cc	2006-11-09 16:10:23 +04:00
+++ 1.324/sql/item_func.cc	2006-11-09 16:10:23 +04:00
@@ -2893,6 +2893,20 @@ void Item_udf_func::cleanup()
 }
 
 
+void Item_udf_func::print(String *str)
+{
+  str->append(func_name());
+  str->append('(');
+  for (uint i=0 ; i < arg_count ; i++)
+  {
+    if (i != 0)
+      str->append(',');
+    args[i]->print_item_w_name(str);
+  }
+  str->append(')');
+}
+
+
 double Item_func_udf_float::val_real()
 {
   DBUG_ASSERT(fixed == 1);

--- 1.50/mysql-test/r/type_newdecimal.result	2006-11-09 16:10:23 +04:00
+++ 1.51/mysql-test/r/type_newdecimal.result	2006-11-09 16:10:23 +04:00
@@ -1422,6 +1422,14 @@ i2	count(distinct j)
 1.0	2
 2.0	2
 drop table t1;
+create table t1(f1 decimal(20,6));
+insert into t1 values (CAST('10:11:12' AS date) + interval 14 microsecond);
+insert into t1 values (CAST('10:11:12' AS time));
+select * from t1;
+f1
+20101112000000.000014
+101112.000000
+drop table t1;
 select cast(143.481 as decimal(4,1));
 cast(143.481 as decimal(4,1))
 143.5

--- 1.43/mysql-test/t/type_newdecimal.test	2006-11-09 16:10:23 +04:00
+++ 1.44/mysql-test/t/type_newdecimal.test	2006-11-09 16:10:23 +04:00
@@ -1120,6 +1120,12 @@ select i, count(distinct j) from t1 grou
 select i+0.0 as i2, count(distinct j) from t1 group by i2;
 drop table t1;
 
+create table t1(f1 decimal(20,6));
+insert into t1 values (CAST('10:11:12' AS date) + interval 14 microsecond);
+insert into t1 values (CAST('10:11:12' AS time));
+select * from t1;
+drop table t1;
+
 #
 # Bug#16172 DECIMAL data type processed incorrectly
 #