Commit 725ab9df authored by unknown's avatar unknown
Browse files

Post merge fix 


mysql-test/r/func_time.result:
  post-merge fix
mysql-test/r/select.result:
  post-merge fix
parent c2575322

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;

End of 4.1 tests

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;

mysql-test/r/select.result

+6 −0
Original line number Diff line number Diff line
@@ -2730,6 +2730,12 @@ ERROR 42000: Key 'a' doesn't exist in table 't1' 
EXPLAIN SELECT * FROM t1 FORCE INDEX (a);

ERROR 42000: Key 'a' doesn't exist in table 't1'

DROP TABLE t1;

CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL);

INSERT INTO t1 VALUES (10);

SELECT i='1e+01',i=1e+01, i in (1e+01,1e+01), i in ('1e+01','1e+01') FROM t1;

i='1e+01'	i=1e+01	i in (1e+01,1e+01)	i in ('1e+01','1e+01')

0	1	1	1

DROP TABLE t1;

CREATE TABLE t1 ( 

K2C4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '', 

K4N4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '0000',