bk commit into 5.0 tree (bell:1.1962) BUG#7521

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell 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.1962 05/06/20 14:56:17 bell@stripped +3 -0
  fixed time_format printing (BUG#7521)

  sql/item_timefunc.h
    1.54 05/06/20 14:56:13 bell@stripped +2 -1
    fixed func_name reportion

  mysql-test/t/view.test
    1.72 05/06/20 14:56:13 bell@stripped +7 -0
    using time_format in view (BUG#7521)

  mysql-test/r/view.result
    1.83 05/06/20 14:56:13 bell@stripped +5 -0
    using time_format in view (BUG#7521)

# 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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-bug3-5.0

--- 1.53/sql/item_timefunc.h	Fri Jun 17 17:27:43 2005
+++ 1.54/sql/item_timefunc.h	Mon Jun 20 14:56:13 2005
@@ -503,7 +503,8 @@
   Item_func_date_format(Item *a,Item *b,bool is_time_format_arg)
     :Item_str_func(a,b),is_time_format(is_time_format_arg) {}
   String *val_str(String *str);
-  const char *func_name() const { return "date_format"; }
+  const char *func_name() const
+    { return is_time_format ? "time_format" : "date_format"; }
   void fix_length_and_dec();
   uint format_length(const String *format);
 };

--- 1.82/mysql-test/r/view.result	Fri Jun 17 17:27:42 2005
+++ 1.83/mysql-test/r/view.result	Mon Jun 20 14:56:13 2005
@@ -1743,3 +1743,8 @@
 cast(1 as decimal)
 1.00
 drop view v1;
+create view v1 as SELECT TIME_FORMAT(SEC_TO_TIME(3600),'%H:%i') as t;
+select * from v1;
+t
+01:00
+drop view v1;

--- 1.71/mysql-test/t/view.test	Fri Jun 17 17:27:42 2005
+++ 1.72/mysql-test/t/view.test	Mon Jun 20 14:56:13 2005
@@ -1587,3 +1587,10 @@
 create view v1 as select cast(1 as decimal);
 select * from v1;
 drop view v1;
+
+#
+# using time_format in view (BUG#7521)
+#
+create view v1 as SELECT TIME_FORMAT(SEC_TO_TIME(3600),'%H:%i') as t;
+select * from v1;
+drop view v1;