Commit 038631da authored by unknown's avatar unknown
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 

into moonbone.local:/work/mysql-5.0-bug-11760


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
parents 9142113c c816f297

mysql-test/r/date_formats.result

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ explain extended select makedate(1997,1), addtime("31.12.97 11.59.59.999999 PM", 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used

Warnings:

Note	1003	select makedate(1997,1) AS `makedate(1997,1)`,addtime(_latin1'31.12.97 11.59.59.999999 PM',_latin1'31.12.97 11.59.59.999999 PM') AS `addtime("31.12.97 11.59.59.999999 PM", "1 1.1.1.000002")`,subtime(_latin1'31.12.97 11.59.59.999999 PM',_latin1'31.12.97 11.59.59.999999 PM') AS `subtime("31.12.97 11.59.59.999999 PM", "1 1.1.1.000002")`,timediff(_latin1'01.01.97 11:59:59.000001 PM',_latin1'31.12.95 11:59:59.000002 PM') AS `timediff("01.01.97 11:59:59.000001 PM","31.12.95 11:59:59.000002 PM")`,cast(str_to_date(_latin1'15-01-2001 12:59:59',_latin1'%d-%m-%Y %H:%i:%S') as time) AS `cast(str_to_date("15-01-2001 12:59:59", "%d-%m-%Y %H:%i:%S") as TIME)`,maketime(23,11,12) AS `maketime(23,11,12)`,microsecond(_latin1'1997-12-31 23:59:59.000001') AS `microsecond("1997-12-31 23:59:59.000001")`

Note	1003	select makedate(1997,1) AS `makedate(1997,1)`,addtime(_latin1'31.12.97 11.59.59.999999 PM',_latin1'1 1.1.1.000002') AS `addtime("31.12.97 11.59.59.999999 PM", "1 1.1.1.000002")`,subtime(_latin1'31.12.97 11.59.59.999999 PM',_latin1'1 1.1.1.000002') AS `subtime("31.12.97 11.59.59.999999 PM", "1 1.1.1.000002")`,timediff(_latin1'01.01.97 11:59:59.000001 PM',_latin1'31.12.95 11:59:59.000002 PM') AS `timediff("01.01.97 11:59:59.000001 PM","31.12.95 11:59:59.000002 PM")`,cast(str_to_date(_latin1'15-01-2001 12:59:59',_latin1'%d-%m-%Y %H:%i:%S') as time) AS `cast(str_to_date("15-01-2001 12:59:59", "%d-%m-%Y %H:%i:%S") as TIME)`,maketime(23,11,12) AS `maketime(23,11,12)`,microsecond(_latin1'1997-12-31 23:59:59.000001') AS `microsecond("1997-12-31 23:59:59.000001")`

create table t1 (d date);

insert into t1 values ('2004-07-14'),('2005-07-14');

select date_format(d,"%d") from t1 order by 1;

mysql-test/r/view.result

+8 −0
Original line number Diff line number Diff line
@@ -2016,3 +2016,11 @@ CALL p1(); 
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

2005-01-01 12:00:00	2005-01-01 10:58:59

drop view v1;

drop table t1;

mysql-test/t/view.test

+10 −0
Original line number Diff line number Diff line
@@ -1853,3 +1853,13 @@ CALL p1(); 
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;

sql/item_timefunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -2524,7 +2524,7 @@ void Item_func_add_time::print(String *str) 
  }

  args[0]->print(str);

  str->append(',');

  args[0]->print(str);

  args[1]->print(str);

  str->append(')');

}