Commit ac2c480f authored by unknown's avatar unknown
Browse files

func_time.result: 

  After merge fix


mysql-test/r/func_time.result:
  After merge fix
parent 0c4182bc

mysql-test/r/func_time.result

+2 −2
Original line number Diff line number Diff line
@@ -785,8 +785,8 @@ select f1 from t1 where "2006-1-1" between f1 and 'zzz'; 
f1

Warnings:

Warning	1292	Incorrect date value: 'zzz' for column 'f1' at row 1

Warning	1292	Truncated incorrect INTEGER value: 'zzz'

Warning	1292	Truncated incorrect INTEGER value: 'zzz'

Warning	1292	Truncated incorrect DOUBLE value: 'zzz'

Warning	1292	Truncated incorrect DOUBLE value: 'zzz'

select f1 from t1 where makedate(2006,1) between date(f1) and date(f3);

f1

2006-01-01