merge fixes (4c8e0e19) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/func_time.result

+3 −4

Original line number	Diff line number	Diff line
		@@ -867,12 +867,11 @@ f1
		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 cast("2006-1-1" as date) between f1 and 'zzz';
		select f1 from t1 where cast("2006-1-1" as date) between f1 and cast('zzz' as date);
		f1
		Warnings:
		Warning 1292 Incorrect date value: 'zzz' for column 'f1' at row 1
		Warning 1292 Truncated incorrect DOUBLE value: 'zzz'
		Warning 1292 Truncated incorrect DOUBLE value: 'zzz'
		Warning 1292 Truncated incorrect datetime value: 'zzz'
		Warning 1292 Truncated incorrect datetime value: 'zzz'
		select f1 from t1 where makedate(2006,1) between date(f1) and date(f3);
		f1
		2006-01-01

mysql-test/r/query_cache.result

+6 −6

Original line number	Diff line number	Diff line
		@@ -947,24 +947,24 @@ COUNT(*)
		Warnings:
		Warning 1292 Incorrect datetime value: '20050327 invalid' for column 'date' at row 1
		Warning 1292 Incorrect datetime value: '20050327 invalid' for column 'date' at row 1
		Warning 1292 Truncated incorrect DOUBLE value: '20050327 invalid'
		Warning 1292 Truncated incorrect DOUBLE value: '20050327 invalid'
		Warning 1292 Truncated incorrect INTEGER value: '20050327 invalid'
		Warning 1292 Truncated incorrect INTEGER value: '20050327 invalid'
		SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050328 invalid';
		COUNT(*)
		0
		Warnings:
		Warning 1292 Incorrect datetime value: '20050328 invalid' for column 'date' at row 1
		Warning 1292 Incorrect datetime value: '20050328 invalid' for column 'date' at row 1
		Warning 1292 Truncated incorrect DOUBLE value: '20050328 invalid'
		Warning 1292 Truncated incorrect DOUBLE value: '20050328 invalid'
		Warning 1292 Truncated incorrect INTEGER value: '20050328 invalid'
		Warning 1292 Truncated incorrect INTEGER value: '20050328 invalid'
		SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 invalid';
		COUNT(*)
		0
		Warnings:
		Warning 1292 Incorrect datetime value: '20050327 invalid' for column 'date' at row 1
		Warning 1292 Incorrect datetime value: '20050327 invalid' for column 'date' at row 1
		Warning 1292 Truncated incorrect DOUBLE value: '20050327 invalid'
		Warning 1292 Truncated incorrect DOUBLE value: '20050327 invalid'
		Warning 1292 Truncated incorrect INTEGER value: '20050327 invalid'
		Warning 1292 Truncated incorrect INTEGER value: '20050327 invalid'
		show status like "Qcache_queries_in_cache";
		Variable_name Value
		Qcache_queries_in_cache 0

mysql-test/r/subselect.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -2947,7 +2947,7 @@ ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10;
		id select_type table type possible_keys key key_len ref rows Extra
		1 PRIMARY t1 system PRIMARY NULL NULL NULL 1
		1 PRIMARY r const PRIMARY PRIMARY 4 const 1
		2 DEPENDENT SUBQUERY t2 range b b 38 NULL 2 Using where
		2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using where
		SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r
		ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
		ORDER BY t2.c DESC, t2.b DESC LIMIT 1) WHERE t1.a = 10;
		@@ -2959,7 +2959,7 @@ ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10;
		id select_type table type possible_keys key key_len ref rows Extra
		1 PRIMARY t1 system PRIMARY NULL NULL NULL 1
		1 PRIMARY r const PRIMARY PRIMARY 4 const 1
		2 DEPENDENT SUBQUERY t2 range b b 38 NULL 2 Using where
		2 DEPENDENT SUBQUERY t2 range b b 40 NULL 2 Using where
		SELECT sql_no_cache t1.a, r.a, r.b FROM t1 LEFT JOIN t2 r
		ON r.a = (SELECT t2.a FROM t2 WHERE t2.c = t1.a AND t2.b <= '359899'
		ORDER BY t2.c, t2.b LIMIT 1) WHERE t1.a = 10;

mysql-test/r/view.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -2586,13 +2586,13 @@ INSERT INTO t1 VALUES
		(4, '2005-01-03'), (5, '2005-01-04'), (6, '2005-01-05'),
		(7, '2005-01-05'), (8, '2005-01-05'), (9, '2005-01-06');
		CREATE VIEW v1 AS SELECT * FROM t1;
		SELECT * FROM t1 WHERE td BETWEEN '2005.01.02' AND '2005.01.04';
		SELECT * FROM t1 WHERE td BETWEEN CAST('2005.01.02' AS DATE) AND CAST('2005.01.04' AS DATE);
		id td
		2 2005-01-02
		3 2005-01-02
		4 2005-01-03
		5 2005-01-04
		SELECT * FROM v1 WHERE td BETWEEN '2005.01.02' AND '2005.01.04';
		SELECT * FROM v1 WHERE td BETWEEN CAST('2005.01.02' AS DATE) AND CAST('2005.01.04' AS DATE);
		id td
		2 2005-01-02
		3 2005-01-02

mysql-test/t/func_time.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -432,7 +432,7 @@ select f3 from t1 where f3 between cast("2006-1-1 12:1:1" as datetime) and cast(
		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 cast("2006-1-1" as date) between f1 and cast('zzz' as date);
		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;