Commit 31c738d8 authored by evgen@moonbone.local's avatar evgen@moonbone.local
Browse files

query_cache.result, func_time.test, type_date.result, func_time.result: 

  Corrected test case after removal of fix for bug#16377         
type_date.test:
  Corrected test case after removal of fix for bug#16377
item_cmpfunc.cc:
  Removed changes to the agg_cmp_type() made in the for bug#16377
parent 68b9ae4d

mysql-test/r/func_time.result

+11 −12
Original line number Diff line number Diff line
@@ -646,37 +646,36 @@ drop table t1; 
create table t1(f1 date, f2 time, f3 datetime);

insert into t1 values ("2006-01-01", "12:01:01", "2006-01-01 12:01:01");

insert into t1 values ("2006-01-02", "12:01:02", "2006-01-02 12:01:02");

select f1 from t1 where f1 between "2006-1-1" and 20060101;

select f1 from t1 where f1 between CAST("2006-1-1" as date) and CAST(20060101 as date);

f1

2006-01-01

select f1 from t1 where f1 between "2006-1-1" and "2006.1.1";

select f1 from t1 where f1 between cast("2006-1-1" as date) and cast("2006.1.1" as date);

f1

2006-01-01

select f1 from t1 where date(f1) between "2006-1-1" and "2006.1.1";

select f1 from t1 where date(f1) between cast("2006-1-1" as date) and cast("2006.1.1" as date);

f1

2006-01-01

select f2 from t1 where f2 between "12:1:2" and "12:2:2";

select f2 from t1 where f2 between cast("12:1:2" as time) and cast("12:2:2" as time);

f2

12:01:02

select f2 from t1 where time(f2) between "12:1:2" and "12:2:2";

select f2 from t1 where time(f2) between cast("12:1:2" as time) and cast("12:2:2" as time);

f2

12:01:02

select f3 from t1 where f3 between "2006-1-1 12:1:1" and "2006-1-1 12:1:2";

select f3 from t1 where f3 between cast("2006-1-1 12:1:1" as datetime) and cast("2006-1-1 12:1:2" as datetime);

f3

2006-01-01 12:01:01

select f3 from t1 where timestamp(f3) between "2006-1-1 12:1:1" and "2006-1-1 12:1:2";

select f3 from t1 where timestamp(f3) between cast("2006-1-1 12:1:1" as datetime) and cast("2006-1-1 12:1:2" as datetime);

f3

2006-01-01 12:01:01

select f1 from t1 where "2006-1-1" between f1 and f3;

select f1 from t1 where cast("2006-1-1" as date) between f1 and f3;

f1

2006-01-01

select f1 from t1 where "2006-1-1" between date(f1) and date(f3);

select f1 from t1 where cast("2006-1-1" as date) between date(f1) and date(f3);

f1

2006-01-01

select f1 from t1 where "2006-1-1" between f1 and 'zzz';

select f1 from t1 where cast("2006-1-1" as date) between f1 and 'zzz';

f1

Warnings:

Warning	1292	Truncated incorrect date value: 'zzz'

2006-01-01

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

f1

2006-01-01

mysql-test/r/query_cache.result

+0 −3
Original line number Diff line number Diff line
@@ -907,19 +907,16 @@ COUNT(*) 
0

Warnings:

Warning	1292	Truncated incorrect datetime value: '20050327 invalid'

Warning	1292	Truncated incorrect datetime value: '20050327 invalid'

SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050328 invalid';

COUNT(*)

0

Warnings:

Warning	1292	Truncated incorrect datetime value: '20050328 invalid'

Warning	1292	Truncated incorrect datetime value: '20050328 invalid'

SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 invalid';

COUNT(*)

0

Warnings:

Warning	1292	Truncated incorrect datetime value: '20050327 invalid'

Warning	1292	Truncated incorrect datetime value: '20050327 invalid'

show status like "Qcache_queries_in_cache";

Variable_name	Value

Qcache_queries_in_cache	0

mysql-test/r/type_date.result

+2 −2
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ INSERT INTO t1 VALUES ( "2000-1-2" ); 
INSERT INTO t1 VALUES ( "2000-1-3" );

INSERT INTO t1 VALUES ( "2000-1-4" );

INSERT INTO t1 VALUES ( "2000-1-5" );

SELECT * FROM t1 WHERE datum BETWEEN "2000-1-2" AND "2000-1-4";

SELECT * FROM t1 WHERE datum BETWEEN cast("2000-1-2" as date) AND cast("2000-1-4" as date);

datum

2000-01-02

2000-01-03

2000-01-04

SELECT * FROM t1 WHERE datum BETWEEN "2000-1-2" AND datum - INTERVAL 100 DAY;

SELECT * FROM t1 WHERE datum BETWEEN cast("2000-1-2" as date) AND datum - INTERVAL 100 DAY;

datum

DROP TABLE t1;

CREATE TABLE t1 (

mysql-test/t/func_time.test

+11 −11
Original line number Diff line number Diff line
@@ -341,20 +341,20 @@ drop table t1; 
#

# Bug#16377 result of DATE/TIME functions were compared as strings which

#           can lead to a wrong result.

#

# Now wrong dates should be compared only with CAST()

create table t1(f1 date, f2 time, f3 datetime);

insert into t1 values ("2006-01-01", "12:01:01", "2006-01-01 12:01:01");

insert into t1 values ("2006-01-02", "12:01:02", "2006-01-02 12:01:02");

select f1 from t1 where f1 between "2006-1-1" and 20060101;

select f1 from t1 where f1 between "2006-1-1" and "2006.1.1";

select f1 from t1 where date(f1) between "2006-1-1" and "2006.1.1";

select f2 from t1 where f2 between "12:1:2" and "12:2:2";

select f2 from t1 where time(f2) between "12:1:2" and "12:2:2";

select f3 from t1 where f3 between "2006-1-1 12:1:1" and "2006-1-1 12:1:2";

select f3 from t1 where timestamp(f3) between "2006-1-1 12:1:1" and "2006-1-1 12:1:2";

select f1 from t1 where "2006-1-1" between f1 and f3;

select f1 from t1 where "2006-1-1" between date(f1) and date(f3);

select f1 from t1 where "2006-1-1" between f1 and 'zzz';

select f1 from t1 where f1 between CAST("2006-1-1" as date) and CAST(20060101 as date);

select f1 from t1 where f1 between cast("2006-1-1" as date) and cast("2006.1.1" as date);

select f1 from t1 where date(f1) between cast("2006-1-1" as date) and cast("2006.1.1" as date);

select f2 from t1 where f2 between cast("12:1:2" as time) and cast("12:2:2" as time);

select f2 from t1 where time(f2) between cast("12:1:2" as time) and cast("12:2:2" as time);

select f3 from t1 where f3 between cast("2006-1-1 12:1:1" as datetime) and cast("2006-1-1 12:1:2" as datetime);

select f3 from t1 where timestamp(f3) between cast("2006-1-1 12:1:1" as datetime) and cast("2006-1-1 12:1:2" as datetime);

select f1 from t1 where cast("2006-1-1" as date) between f1 and f3;

select f1 from t1 where cast("2006-1-1" as date) between date(f1) and date(f3);

select f1 from t1 where cast("2006-1-1" as date) between f1 and 'zzz';

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

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

drop table t1;

mysql-test/t/type_date.test

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ INSERT INTO t1 VALUES ( "2000-1-2" ); 
INSERT INTO t1 VALUES ( "2000-1-3" );

INSERT INTO t1 VALUES ( "2000-1-4" );

INSERT INTO t1 VALUES ( "2000-1-5" );

SELECT * FROM t1 WHERE datum BETWEEN "2000-1-2" AND "2000-1-4";

SELECT * FROM t1 WHERE datum BETWEEN "2000-1-2" AND datum - INTERVAL 100 DAY;

SELECT * FROM t1 WHERE datum BETWEEN cast("2000-1-2" as date) AND cast("2000-1-4" as date);

SELECT * FROM t1 WHERE datum BETWEEN cast("2000-1-2" as date) AND datum - INTERVAL 100 DAY;

DROP TABLE t1;



#