Commit c6b67f0d authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/ram/work/mysql-4.1 

into  mysql.com:/usr/home/ram/work/mysql-5.0


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
mysql-test/r/func_time.result:
  SCCS merged
parents 406a7ba9 49042de5

mysql-test/r/func_time.result

+10 −3
Original line number Diff line number Diff line
@@ -794,10 +794,17 @@ select f1 from t1 where makedate(2006,2) between date(f1) and date(f3); 
f1

2006-01-02

drop table t1;

select now() - now() + 0, curtime() - curtime() + 0, 

create table t1 select now() - now(), curtime() - curtime(), 

sec_to_time(1) + 0, from_unixtime(1) + 0;

now() - now() + 0	curtime() - curtime() + 0	sec_to_time(1) + 0	from_unixtime(1) + 0

0.000000	0.000000	1.000000	19700101030001.000000

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `now() - now()` double(23,6) NOT NULL default '0.000000',

  `curtime() - curtime()` double(23,6) NOT NULL default '0.000000',

  `sec_to_time(1) + 0` double(23,6) default NULL,

  `from_unixtime(1) + 0` double(23,6) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

explain extended select timestampdiff(SQL_TSI_WEEK, '2001-02-01', '2001-05-01') as a1,

timestampdiff(SQL_TSI_FRAC_SECOND, '2001-02-01 12:59:59.120000', '2001-05-01 12:58:58.119999') as a2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

mysql-test/t/func_time.test

+4 −2
Original line number Diff line number Diff line
@@ -392,8 +392,10 @@ drop table t1; 
# Bug #16546

# 



select now() - now() + 0, curtime() - curtime() + 0, 

create table t1 select now() - now(), curtime() - curtime(), 

                       sec_to_time(1) + 0, from_unixtime(1) + 0;

show create table t1;

drop table t1;



# End of 4.1 tests