bk commit into 5.0 tree (evgen:1.1957)

[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.1957 05/07/20 06:59:31 evgen@stripped +2 -0
  Merge epotemkin@stripped:/home/bk/mysql-5.0
  into moonbone.local:/work/mysql-5.0-bug-11760

  mysql-test/t/view.test
    1.89 05/07/20 06:59:29 evgen@stripped +0 -0
    Auto merged

  mysql-test/r/view.result
    1.95 05/07/20 06:59:29 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-11760/RESYNC

--- 1.94/mysql-test/r/view.result	2005-07-19 20:06:42 +04:00
+++ 1.95/mysql-test/r/view.result	2005-07-20 06:59:29 +04:00
@@ -2016,3 +2016,11 @@
 DROP PROCEDURE p1;
 DROP VIEW v1;
 DROP TABLE t1;
+create table t1(f1 datetime);
+insert into t1 values('2005.01.01 12:0:0');
+create view v1 as select f1, subtime(f1, '1:1:1') as sb from t1;
+select * from v1;
+f1	sb
[phone]:00:00	2005-01-01 10:58:59
+drop view v1;
+drop table t1;

--- 1.88/mysql-test/t/view.test	2005-07-19 20:06:42 +04:00
+++ 1.89/mysql-test/t/view.test	2005-07-20 06:59:29 +04:00
@@ -1853,3 +1853,13 @@
 DROP PROCEDURE p1;
 DROP VIEW v1;
 DROP TABLE t1;
+
+#
+# Bug #11760 Typo in Item_func_add_time::print() results in NULLs returned
+#             subtime() in view
+create table t1(f1 datetime);
+insert into t1 values('2005.01.01 12:0:0');
+create view v1 as select f1, subtime(f1, '1:1:1') as sb from t1;
+select * from v1;
+drop view v1;
+drop table t1;