diff --git a/mysql-test/main/func_extract.result b/mysql-test/main/func_extract.result
index bebb8c717f6..dc71f6ae27a 100644
--- a/mysql-test/main/func_extract.result
+++ b/mysql-test/main/func_extract.result
@@ -590,3 +590,885 @@ Warning	1292	Truncated incorrect time value: '01:02:03/'
 Warning	1292	Truncated incorrect time value: '01:02:03/'
 Warning	1292	Truncated incorrect INTERVAL DAY TO SECOND value: '01:02:03/'
 DROP TABLE t1;
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-33496 Out of range error in AVG(YEAR(datetime)) due to a wrong data type
+#
+CREATE FUNCTION select01() RETURNS TEXT RETURN 'SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?';
+CREATE FUNCTION select02() RETURNS TEXT RETURN 'SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)';
+CREATE TABLE t1 (a DATETIME(6));
+INSERT INTO t1 VALUES ('2001-12-31 10:20:30.999999');
+CREATE FUNCTION params(expr TEXT, count INT) RETURNS TEXT
+BEGIN
+RETURN CONCAT(expr, REPEAT(CONCAT(', ', expr), count-1));
+END;
+$$
+CREATE PROCEDURE show_drop()
+BEGIN
+SELECT TABLE_NAME, COLUMN_TYPE, COLUMN_NAME
+FROM INFORMATION_SCHEMA.COLUMNS
+WHERE TABLE_SCHEMA='test'
+     AND TABLE_NAME IN ('t1e_nm','t2e_nm','t1f_nm','t2f_nm',
+'t1e_ps','t1f_ps','t2e_ps','t2f_ps')
+ORDER BY LEFT(TABLE_NAME, 2), ORDINAL_POSITION, TABLE_NAME;
+FOR rec IN (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
+WHERE TABLE_SCHEMA='test'
+              AND TABLE_NAME IN ('t1e_nm','t2e_nm','t1f_nm','t2f_nm',
+'t1e_ps','t1f_ps','t2e_ps','t2f_ps'))
+DO
+EXECUTE IMMEDIATE CONCAT('DROP TABLE ', rec.TABLE_NAME);
+END FOR;
+END;
+$$
+CREATE PROCEDURE p1(unit VARCHAR(32))
+BEGIN
+DECLARE do_extract BOOL DEFAULT unit NOT IN('DAYOFYEAR');
+DECLARE query01 TEXT DEFAULT
+CONCAT('CREATE TABLE t2 AS ', select01(), ' FROM t1');
+DECLARE query02 TEXT DEFAULT
+CONCAT('CREATE TABLE t2 AS ', select02(), ' FROM t1');
+IF (do_extract)
+THEN
+EXECUTE IMMEDIATE REPLACE(REPLACE(query01,'t2','t1e_nm'),'?', CONCAT('EXTRACT(',unit,' FROM a)'));
+EXECUTE IMMEDIATE REPLACE(REPLACE(query02,'t2','t2e_nm'),'?', CONCAT('EXTRACT(',unit,' FROM a)'));
+END IF;
+EXECUTE IMMEDIATE REPLACE(REPLACE(query01,'t2','t1f_nm'),'?', CONCAT(unit,'(a)'));
+EXECUTE IMMEDIATE REPLACE(REPLACE(query02,'t2','t2f_nm'),'?', CONCAT(unit,'(a)'));
+END;
+$$
+
+
+# EXTRACT(YEAR FROM expr) and YEAR(expr) are equivalent
+CALL p1('YEAR');
+EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(YEAR FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), YEAR(TIMESTAMP'2001-12-13 10:20:30.999999');
+CALL show_drop;
+TABLE_NAME	COLUMN_TYPE	COLUMN_NAME
+t1e_nm	int(5)	EXTRACT(YEAR FROM a)
+t1e_ps	int(5)	?
+t1f_nm	int(5)	YEAR(a)
+t1f_ps	int(5)	?
+t1e_nm	int(4) unsigned	CAST(EXTRACT(YEAR FROM a) AS UNSIGNED)
+t1e_ps	int(4) unsigned	CAST(? AS UNSIGNED)
+t1f_nm	int(4) unsigned	CAST(YEAR(a) AS UNSIGNED)
+t1f_ps	int(4) unsigned	CAST(? AS UNSIGNED)
+t1e_nm	int(5)	CAST(EXTRACT(YEAR FROM a) AS SIGNED)
+t1e_ps	int(5)	CAST(? AS SIGNED)
+t1f_nm	int(5)	CAST(YEAR(a) AS SIGNED)
+t1f_ps	int(5)	CAST(? AS SIGNED)
+t1e_nm	int(5)	ABS(EXTRACT(YEAR FROM a))
+t1e_ps	int(5)	ABS(?)
+t1f_nm	int(5)	ABS(YEAR(a))
+t1f_ps	int(5)	ABS(?)
+t1e_nm	int(5)	ROUND(EXTRACT(YEAR FROM a))
+t1e_ps	int(5)	ROUND(?)
+t1f_nm	int(5)	ROUND(YEAR(a))
+t1f_ps	int(5)	ROUND(?)
+t1e_nm	int(5)	-EXTRACT(YEAR FROM a)
+t1e_ps	int(5)	-?
+t1f_nm	int(5)	-YEAR(a)
+t1f_ps	int(5)	-?
+t1e_nm	int(6)	ROUND(EXTRACT(YEAR FROM a),-1)
+t1e_ps	int(6)	ROUND(?,-1)
+t1f_nm	int(6)	ROUND(YEAR(a),-1)
+t1f_ps	int(6)	ROUND(?,-1)
+t1e_nm	int(6)	EXTRACT(YEAR FROM a)+0
+t1e_ps	int(6)	?+0
+t1f_nm	int(6)	YEAR(a)+0
+t1f_ps	int(6)	?+0
+t1e_nm	decimal(6,1)	EXTRACT(YEAR FROM a)+0.0
+t1e_ps	decimal(6,1)	?+0.0
+t1f_nm	decimal(6,1)	YEAR(a)+0.0
+t1f_ps	decimal(6,1)	?+0.0
+t1e_nm	varchar(4)	CONCAT(EXTRACT(YEAR FROM a))
+t1e_ps	varchar(4)	CONCAT(?)
+t1f_nm	varchar(4)	CONCAT(YEAR(a))
+t1f_ps	varchar(4)	CONCAT(?)
+t1e_nm	int(5)	LEAST(EXTRACT(YEAR FROM a),EXTRACT(YEAR FROM a))
+t1e_ps	int(5)	LEAST(?,?)
+t1f_nm	int(5)	LEAST(YEAR(a),YEAR(a))
+t1f_ps	int(5)	LEAST(?,?)
+t1e_nm	int(5)	COALESCE(EXTRACT(YEAR FROM a))
+t1e_ps	int(5)	COALESCE(?)
+t1f_nm	int(5)	COALESCE(YEAR(a))
+t1f_ps	int(5)	COALESCE(?)
+t1e_nm	int(5)	COALESCE(EXTRACT(YEAR FROM a),CAST(1 AS SIGNED))
+t1e_ps	int(5)	COALESCE(?,CAST(1 AS SIGNED))
+t1f_nm	int(5)	COALESCE(YEAR(a),CAST(1 AS SIGNED))
+t1f_ps	int(5)	COALESCE(?,CAST(1 AS SIGNED))
+t1e_nm	decimal(4,0)	COALESCE(EXTRACT(YEAR FROM a),CAST(1 AS UNSIGNED))
+t1e_ps	decimal(4,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1f_nm	decimal(4,0)	COALESCE(YEAR(a),CAST(1 AS UNSIGNED))
+t1f_ps	decimal(4,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1e_nm	int(5)	@a:=EXTRACT(YEAR FROM a)
+t1e_ps	int(5)	@a:=?
+t1f_nm	int(5)	@a:=YEAR(a)
+t1f_ps	int(5)	@a:=?
+t2e_nm	decimal(8,4)	AVG(EXTRACT(YEAR FROM a))
+t2e_ps	decimal(8,4)	AVG(?)
+t2f_nm	decimal(8,4)	AVG(YEAR(a))
+t2f_ps	decimal(8,4)	AVG(?)
+t2e_nm	bigint(5)	MIN(EXTRACT(YEAR FROM a))
+t2e_ps	bigint(5)	MIN(?)
+t2f_nm	bigint(5)	MIN(YEAR(a))
+t2f_ps	bigint(5)	MIN(?)
+t2e_nm	bigint(5)	MAX(EXTRACT(YEAR FROM a))
+t2e_ps	bigint(5)	MAX(?)
+t2f_nm	bigint(5)	MAX(YEAR(a))
+t2f_ps	bigint(5)	MAX(?)
+t2e_nm	mediumtext	GROUP_CONCAT(EXTRACT(YEAR FROM a))
+t2e_ps	mediumtext	GROUP_CONCAT(?)
+t2f_nm	mediumtext	GROUP_CONCAT(YEAR(a))
+t2f_ps	mediumtext	GROUP_CONCAT(?)
+
+
+# EXTRACT(QUARTER FROM expr) and QUARTER(expr) are equavalent
+CALL p1('QUARTER');
+EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(QUARTER FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999'), QUARTER(TIMESTAMP'2001-12-13 10:20:30.999999');
+CALL show_drop;
+TABLE_NAME	COLUMN_TYPE	COLUMN_NAME
+t1e_nm	int(2)	EXTRACT(QUARTER FROM a)
+t1e_ps	int(2)	?
+t1f_nm	int(2)	QUARTER(a)
+t1f_ps	int(2)	?
+t1e_nm	int(1) unsigned	CAST(EXTRACT(QUARTER FROM a) AS UNSIGNED)
+t1e_ps	int(1) unsigned	CAST(? AS UNSIGNED)
+t1f_nm	int(1) unsigned	CAST(QUARTER(a) AS UNSIGNED)
+t1f_ps	int(1) unsigned	CAST(? AS UNSIGNED)
+t1e_nm	int(2)	CAST(EXTRACT(QUARTER FROM a) AS SIGNED)
+t1e_ps	int(2)	CAST(? AS SIGNED)
+t1f_nm	int(2)	CAST(QUARTER(a) AS SIGNED)
+t1f_ps	int(2)	CAST(? AS SIGNED)
+t1e_nm	int(2)	ABS(EXTRACT(QUARTER FROM a))
+t1e_ps	int(2)	ABS(?)
+t1f_nm	int(2)	ABS(QUARTER(a))
+t1f_ps	int(2)	ABS(?)
+t1e_nm	int(2)	ROUND(EXTRACT(QUARTER FROM a))
+t1e_ps	int(2)	ROUND(?)
+t1f_nm	int(2)	ROUND(QUARTER(a))
+t1f_ps	int(2)	ROUND(?)
+t1e_nm	int(2)	-EXTRACT(QUARTER FROM a)
+t1e_ps	int(2)	-?
+t1f_nm	int(2)	-QUARTER(a)
+t1f_ps	int(2)	-?
+t1e_nm	int(3)	ROUND(EXTRACT(QUARTER FROM a),-1)
+t1e_ps	int(3)	ROUND(?,-1)
+t1f_nm	int(3)	ROUND(QUARTER(a),-1)
+t1f_ps	int(3)	ROUND(?,-1)
+t1e_nm	int(3)	EXTRACT(QUARTER FROM a)+0
+t1e_ps	int(3)	?+0
+t1f_nm	int(3)	QUARTER(a)+0
+t1f_ps	int(3)	?+0
+t1e_nm	decimal(3,1)	EXTRACT(QUARTER FROM a)+0.0
+t1e_ps	decimal(3,1)	?+0.0
+t1f_nm	decimal(3,1)	QUARTER(a)+0.0
+t1f_ps	decimal(3,1)	?+0.0
+t1e_nm	varchar(1)	CONCAT(EXTRACT(QUARTER FROM a))
+t1e_ps	varchar(1)	CONCAT(?)
+t1f_nm	varchar(1)	CONCAT(QUARTER(a))
+t1f_ps	varchar(1)	CONCAT(?)
+t1e_nm	int(2)	LEAST(EXTRACT(QUARTER FROM a),EXTRACT(QUARTER FROM a))
+t1e_ps	int(2)	LEAST(?,?)
+t1f_nm	int(2)	LEAST(QUARTER(a),QUARTER(a))
+t1f_ps	int(2)	LEAST(?,?)
+t1e_nm	int(2)	COALESCE(EXTRACT(QUARTER FROM a))
+t1e_ps	int(2)	COALESCE(?)
+t1f_nm	int(2)	COALESCE(QUARTER(a))
+t1f_ps	int(2)	COALESCE(?)
+t1e_nm	int(2)	COALESCE(EXTRACT(QUARTER FROM a),CAST(1 AS SIGNED))
+t1e_ps	int(2)	COALESCE(?,CAST(1 AS SIGNED))
+t1f_nm	int(2)	COALESCE(QUARTER(a),CAST(1 AS SIGNED))
+t1f_ps	int(2)	COALESCE(?,CAST(1 AS SIGNED))
+t1e_nm	decimal(1,0)	COALESCE(EXTRACT(QUARTER FROM a),CAST(1 AS UNSIGNED))
+t1e_ps	decimal(1,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1f_nm	decimal(1,0)	COALESCE(QUARTER(a),CAST(1 AS UNSIGNED))
+t1f_ps	decimal(1,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1e_nm	int(2)	@a:=EXTRACT(QUARTER FROM a)
+t1e_ps	int(2)	@a:=?
+t1f_nm	int(2)	@a:=QUARTER(a)
+t1f_ps	int(2)	@a:=?
+t2e_nm	decimal(5,4)	AVG(EXTRACT(QUARTER FROM a))
+t2e_ps	decimal(5,4)	AVG(?)
+t2f_nm	decimal(5,4)	AVG(QUARTER(a))
+t2f_ps	decimal(5,4)	AVG(?)
+t2e_nm	bigint(2)	MIN(EXTRACT(QUARTER FROM a))
+t2e_ps	bigint(2)	MIN(?)
+t2f_nm	bigint(2)	MIN(QUARTER(a))
+t2f_ps	bigint(2)	MIN(?)
+t2e_nm	bigint(2)	MAX(EXTRACT(QUARTER FROM a))
+t2e_ps	bigint(2)	MAX(?)
+t2f_nm	bigint(2)	MAX(QUARTER(a))
+t2f_ps	bigint(2)	MAX(?)
+t2e_nm	mediumtext	GROUP_CONCAT(EXTRACT(QUARTER FROM a))
+t2e_ps	mediumtext	GROUP_CONCAT(?)
+t2f_nm	mediumtext	GROUP_CONCAT(QUARTER(a))
+t2f_ps	mediumtext	GROUP_CONCAT(?)
+
+
+# EXTRACT(MONTH FROM expr) and MONTH(expr) are equavalent
+CALL p1('MONTH');
+EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MONTH FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999'), MONTH(TIMESTAMP'2001-12-13 10:20:30.999999');
+CALL show_drop;
+TABLE_NAME	COLUMN_TYPE	COLUMN_NAME
+t1e_nm	int(3)	EXTRACT(MONTH FROM a)
+t1e_ps	int(3)	?
+t1f_nm	int(3)	MONTH(a)
+t1f_ps	int(3)	?
+t1e_nm	int(2) unsigned	CAST(EXTRACT(MONTH FROM a) AS UNSIGNED)
+t1e_ps	int(2) unsigned	CAST(? AS UNSIGNED)
+t1f_nm	int(2) unsigned	CAST(MONTH(a) AS UNSIGNED)
+t1f_ps	int(2) unsigned	CAST(? AS UNSIGNED)
+t1e_nm	int(3)	CAST(EXTRACT(MONTH FROM a) AS SIGNED)
+t1e_ps	int(3)	CAST(? AS SIGNED)
+t1f_nm	int(3)	CAST(MONTH(a) AS SIGNED)
+t1f_ps	int(3)	CAST(? AS SIGNED)
+t1e_nm	int(3)	ABS(EXTRACT(MONTH FROM a))
+t1e_ps	int(3)	ABS(?)
+t1f_nm	int(3)	ABS(MONTH(a))
+t1f_ps	int(3)	ABS(?)
+t1e_nm	int(3)	ROUND(EXTRACT(MONTH FROM a))
+t1e_ps	int(3)	ROUND(?)
+t1f_nm	int(3)	ROUND(MONTH(a))
+t1f_ps	int(3)	ROUND(?)
+t1e_nm	int(3)	-EXTRACT(MONTH FROM a)
+t1e_ps	int(3)	-?
+t1f_nm	int(3)	-MONTH(a)
+t1f_ps	int(3)	-?
+t1e_nm	int(4)	ROUND(EXTRACT(MONTH FROM a),-1)
+t1e_ps	int(4)	ROUND(?,-1)
+t1f_nm	int(4)	ROUND(MONTH(a),-1)
+t1f_ps	int(4)	ROUND(?,-1)
+t1e_nm	int(4)	EXTRACT(MONTH FROM a)+0
+t1e_ps	int(4)	?+0
+t1f_nm	int(4)	MONTH(a)+0
+t1f_ps	int(4)	?+0
+t1e_nm	decimal(4,1)	EXTRACT(MONTH FROM a)+0.0
+t1e_ps	decimal(4,1)	?+0.0
+t1f_nm	decimal(4,1)	MONTH(a)+0.0
+t1f_ps	decimal(4,1)	?+0.0
+t1e_nm	varchar(2)	CONCAT(EXTRACT(MONTH FROM a))
+t1e_ps	varchar(2)	CONCAT(?)
+t1f_nm	varchar(2)	CONCAT(MONTH(a))
+t1f_ps	varchar(2)	CONCAT(?)
+t1e_nm	int(3)	LEAST(EXTRACT(MONTH FROM a),EXTRACT(MONTH FROM a))
+t1e_ps	int(3)	LEAST(?,?)
+t1f_nm	int(3)	LEAST(MONTH(a),MONTH(a))
+t1f_ps	int(3)	LEAST(?,?)
+t1e_nm	int(3)	COALESCE(EXTRACT(MONTH FROM a))
+t1e_ps	int(3)	COALESCE(?)
+t1f_nm	int(3)	COALESCE(MONTH(a))
+t1f_ps	int(3)	COALESCE(?)
+t1e_nm	int(3)	COALESCE(EXTRACT(MONTH FROM a),CAST(1 AS SIGNED))
+t1e_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1f_nm	int(3)	COALESCE(MONTH(a),CAST(1 AS SIGNED))
+t1f_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1e_nm	decimal(2,0)	COALESCE(EXTRACT(MONTH FROM a),CAST(1 AS UNSIGNED))
+t1e_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1f_nm	decimal(2,0)	COALESCE(MONTH(a),CAST(1 AS UNSIGNED))
+t1f_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1e_nm	int(3)	@a:=EXTRACT(MONTH FROM a)
+t1e_ps	int(3)	@a:=?
+t1f_nm	int(3)	@a:=MONTH(a)
+t1f_ps	int(3)	@a:=?
+t2e_nm	decimal(6,4)	AVG(EXTRACT(MONTH FROM a))
+t2e_ps	decimal(6,4)	AVG(?)
+t2f_nm	decimal(6,4)	AVG(MONTH(a))
+t2f_ps	decimal(6,4)	AVG(?)
+t2e_nm	bigint(3)	MIN(EXTRACT(MONTH FROM a))
+t2e_ps	bigint(3)	MIN(?)
+t2f_nm	bigint(3)	MIN(MONTH(a))
+t2f_ps	bigint(3)	MIN(?)
+t2e_nm	bigint(3)	MAX(EXTRACT(MONTH FROM a))
+t2e_ps	bigint(3)	MAX(?)
+t2f_nm	bigint(3)	MAX(MONTH(a))
+t2f_ps	bigint(3)	MAX(?)
+t2e_nm	mediumtext	GROUP_CONCAT(EXTRACT(MONTH FROM a))
+t2e_ps	mediumtext	GROUP_CONCAT(?)
+t2f_nm	mediumtext	GROUP_CONCAT(MONTH(a))
+t2f_ps	mediumtext	GROUP_CONCAT(?)
+
+
+# EXTRACT(WEEK FROM expr) and WEEK(expr) are equavalent
+CALL p1('WEEK');
+EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(WEEK FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999'), WEEK(TIMESTAMP'2001-12-13 10:20:30.999999');
+CALL show_drop;
+TABLE_NAME	COLUMN_TYPE	COLUMN_NAME
+t1e_nm	int(3)	EXTRACT(WEEK FROM a)
+t1e_ps	int(3)	?
+t1f_nm	int(3)	WEEK(a)
+t1f_ps	int(3)	?
+t1e_nm	int(2) unsigned	CAST(EXTRACT(WEEK FROM a) AS UNSIGNED)
+t1e_ps	int(2) unsigned	CAST(? AS UNSIGNED)
+t1f_nm	int(2) unsigned	CAST(WEEK(a) AS UNSIGNED)
+t1f_ps	int(2) unsigned	CAST(? AS UNSIGNED)
+t1e_nm	int(3)	CAST(EXTRACT(WEEK FROM a) AS SIGNED)
+t1e_ps	int(3)	CAST(? AS SIGNED)
+t1f_nm	int(3)	CAST(WEEK(a) AS SIGNED)
+t1f_ps	int(3)	CAST(? AS SIGNED)
+t1e_nm	int(3)	ABS(EXTRACT(WEEK FROM a))
+t1e_ps	int(3)	ABS(?)
+t1f_nm	int(3)	ABS(WEEK(a))
+t1f_ps	int(3)	ABS(?)
+t1e_nm	int(3)	ROUND(EXTRACT(WEEK FROM a))
+t1e_ps	int(3)	ROUND(?)
+t1f_nm	int(3)	ROUND(WEEK(a))
+t1f_ps	int(3)	ROUND(?)
+t1e_nm	int(3)	-EXTRACT(WEEK FROM a)
+t1e_ps	int(3)	-?
+t1f_nm	int(3)	-WEEK(a)
+t1f_ps	int(3)	-?
+t1e_nm	int(4)	ROUND(EXTRACT(WEEK FROM a),-1)
+t1e_ps	int(4)	ROUND(?,-1)
+t1f_nm	int(4)	ROUND(WEEK(a),-1)
+t1f_ps	int(4)	ROUND(?,-1)
+t1e_nm	int(4)	EXTRACT(WEEK FROM a)+0
+t1e_ps	int(4)	?+0
+t1f_nm	int(4)	WEEK(a)+0
+t1f_ps	int(4)	?+0
+t1e_nm	decimal(4,1)	EXTRACT(WEEK FROM a)+0.0
+t1e_ps	decimal(4,1)	?+0.0
+t1f_nm	decimal(4,1)	WEEK(a)+0.0
+t1f_ps	decimal(4,1)	?+0.0
+t1e_nm	varchar(2)	CONCAT(EXTRACT(WEEK FROM a))
+t1e_ps	varchar(2)	CONCAT(?)
+t1f_nm	varchar(2)	CONCAT(WEEK(a))
+t1f_ps	varchar(2)	CONCAT(?)
+t1e_nm	int(3)	LEAST(EXTRACT(WEEK FROM a),EXTRACT(WEEK FROM a))
+t1e_ps	int(3)	LEAST(?,?)
+t1f_nm	int(3)	LEAST(WEEK(a),WEEK(a))
+t1f_ps	int(3)	LEAST(?,?)
+t1e_nm	int(3)	COALESCE(EXTRACT(WEEK FROM a))
+t1e_ps	int(3)	COALESCE(?)
+t1f_nm	int(3)	COALESCE(WEEK(a))
+t1f_ps	int(3)	COALESCE(?)
+t1e_nm	int(3)	COALESCE(EXTRACT(WEEK FROM a),CAST(1 AS SIGNED))
+t1e_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1f_nm	int(3)	COALESCE(WEEK(a),CAST(1 AS SIGNED))
+t1f_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1e_nm	decimal(2,0)	COALESCE(EXTRACT(WEEK FROM a),CAST(1 AS UNSIGNED))
+t1e_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1f_nm	decimal(2,0)	COALESCE(WEEK(a),CAST(1 AS UNSIGNED))
+t1f_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1e_nm	int(3)	@a:=EXTRACT(WEEK FROM a)
+t1e_ps	int(3)	@a:=?
+t1f_nm	int(3)	@a:=WEEK(a)
+t1f_ps	int(3)	@a:=?
+t2e_nm	decimal(6,4)	AVG(EXTRACT(WEEK FROM a))
+t2e_ps	decimal(6,4)	AVG(?)
+t2f_nm	decimal(6,4)	AVG(WEEK(a))
+t2f_ps	decimal(6,4)	AVG(?)
+t2e_nm	bigint(3)	MIN(EXTRACT(WEEK FROM a))
+t2e_ps	bigint(3)	MIN(?)
+t2f_nm	bigint(3)	MIN(WEEK(a))
+t2f_ps	bigint(3)	MIN(?)
+t2e_nm	bigint(3)	MAX(EXTRACT(WEEK FROM a))
+t2e_ps	bigint(3)	MAX(?)
+t2f_nm	bigint(3)	MAX(WEEK(a))
+t2f_ps	bigint(3)	MAX(?)
+t2e_nm	mediumtext	GROUP_CONCAT(EXTRACT(WEEK FROM a))
+t2e_ps	mediumtext	GROUP_CONCAT(?)
+t2f_nm	mediumtext	GROUP_CONCAT(WEEK(a))
+t2f_ps	mediumtext	GROUP_CONCAT(?)
+
+
+# EXTRACT(DAY FROM expr) returns hours/24 and includes the sign for TIME
+# DAY(expr) returns the DD part of CAST(expr AS DATETIME)
+CALL p1('DAY');
+EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(DAY FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999'), DAY(TIMESTAMP'2001-12-13 10:20:30.999999');
+CALL show_drop;
+TABLE_NAME	COLUMN_TYPE	COLUMN_NAME
+t1e_nm	int(3)	EXTRACT(DAY FROM a)
+t1e_ps	int(3)	?
+t1f_nm	int(3)	DAY(a)
+t1f_ps	int(3)	?
+t1e_nm	bigint(20) unsigned	CAST(EXTRACT(DAY FROM a) AS UNSIGNED)
+t1e_ps	bigint(20) unsigned	CAST(? AS UNSIGNED)
+t1f_nm	int(2) unsigned	CAST(DAY(a) AS UNSIGNED)
+t1f_ps	int(2) unsigned	CAST(? AS UNSIGNED)
+t1e_nm	int(3)	CAST(EXTRACT(DAY FROM a) AS SIGNED)
+t1e_ps	int(3)	CAST(? AS SIGNED)
+t1f_nm	int(3)	CAST(DAY(a) AS SIGNED)
+t1f_ps	int(3)	CAST(? AS SIGNED)
+t1e_nm	int(3)	ABS(EXTRACT(DAY FROM a))
+t1e_ps	int(3)	ABS(?)
+t1f_nm	int(3)	ABS(DAY(a))
+t1f_ps	int(3)	ABS(?)
+t1e_nm	int(3)	ROUND(EXTRACT(DAY FROM a))
+t1e_ps	int(3)	ROUND(?)
+t1f_nm	int(3)	ROUND(DAY(a))
+t1f_ps	int(3)	ROUND(?)
+t1e_nm	int(4)	-EXTRACT(DAY FROM a)
+t1e_ps	int(4)	-?
+t1f_nm	int(3)	-DAY(a)
+t1f_ps	int(3)	-?
+t1e_nm	int(4)	ROUND(EXTRACT(DAY FROM a),-1)
+t1e_ps	int(4)	ROUND(?,-1)
+t1f_nm	int(4)	ROUND(DAY(a),-1)
+t1f_ps	int(4)	ROUND(?,-1)
+t1e_nm	int(4)	EXTRACT(DAY FROM a)+0
+t1e_ps	int(4)	?+0
+t1f_nm	int(4)	DAY(a)+0
+t1f_ps	int(4)	?+0
+t1e_nm	decimal(4,1)	EXTRACT(DAY FROM a)+0.0
+t1e_ps	decimal(4,1)	?+0.0
+t1f_nm	decimal(4,1)	DAY(a)+0.0
+t1f_ps	decimal(4,1)	?+0.0
+t1e_nm	varchar(3)	CONCAT(EXTRACT(DAY FROM a))
+t1e_ps	varchar(3)	CONCAT(?)
+t1f_nm	varchar(2)	CONCAT(DAY(a))
+t1f_ps	varchar(2)	CONCAT(?)
+t1e_nm	int(3)	LEAST(EXTRACT(DAY FROM a),EXTRACT(DAY FROM a))
+t1e_ps	int(3)	LEAST(?,?)
+t1f_nm	int(3)	LEAST(DAY(a),DAY(a))
+t1f_ps	int(3)	LEAST(?,?)
+t1e_nm	int(3)	COALESCE(EXTRACT(DAY FROM a))
+t1e_ps	int(3)	COALESCE(?)
+t1f_nm	int(3)	COALESCE(DAY(a))
+t1f_ps	int(3)	COALESCE(?)
+t1e_nm	int(3)	COALESCE(EXTRACT(DAY FROM a),CAST(1 AS SIGNED))
+t1e_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1f_nm	int(3)	COALESCE(DAY(a),CAST(1 AS SIGNED))
+t1f_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1e_nm	decimal(2,0)	COALESCE(EXTRACT(DAY FROM a),CAST(1 AS UNSIGNED))
+t1e_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1f_nm	decimal(2,0)	COALESCE(DAY(a),CAST(1 AS UNSIGNED))
+t1f_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1e_nm	int(3)	@a:=EXTRACT(DAY FROM a)
+t1e_ps	int(3)	@a:=?
+t1f_nm	int(3)	@a:=DAY(a)
+t1f_ps	int(3)	@a:=?
+t2e_nm	decimal(6,4)	AVG(EXTRACT(DAY FROM a))
+t2e_ps	decimal(6,4)	AVG(?)
+t2f_nm	decimal(6,4)	AVG(DAY(a))
+t2f_ps	decimal(6,4)	AVG(?)
+t2e_nm	bigint(3)	MIN(EXTRACT(DAY FROM a))
+t2e_ps	bigint(3)	MIN(?)
+t2f_nm	bigint(3)	MIN(DAY(a))
+t2f_ps	bigint(3)	MIN(?)
+t2e_nm	bigint(3)	MAX(EXTRACT(DAY FROM a))
+t2e_ps	bigint(3)	MAX(?)
+t2f_nm	bigint(3)	MAX(DAY(a))
+t2f_ps	bigint(3)	MAX(?)
+t2e_nm	mediumtext	GROUP_CONCAT(EXTRACT(DAY FROM a))
+t2e_ps	mediumtext	GROUP_CONCAT(?)
+t2f_nm	mediumtext	GROUP_CONCAT(DAY(a))
+t2f_ps	mediumtext	GROUP_CONCAT(?)
+
+
+# EXTRACT(HOUR FROM expr) returns hours%24 and includes the sign for TIME
+# HOUR(expr) returns the hh part of CAST(expr AS DATETIME)
+CALL p1('HOUR');
+EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(HOUR FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999'), HOUR(TIMESTAMP'2001-12-13 10:20:30.999999');
+CALL show_drop;
+TABLE_NAME	COLUMN_TYPE	COLUMN_NAME
+t1e_nm	int(3)	EXTRACT(HOUR FROM a)
+t1e_ps	int(3)	?
+t1f_nm	int(3)	HOUR(a)
+t1f_ps	int(3)	?
+t1e_nm	bigint(20) unsigned	CAST(EXTRACT(HOUR FROM a) AS UNSIGNED)
+t1e_ps	bigint(20) unsigned	CAST(? AS UNSIGNED)
+t1f_nm	int(2) unsigned	CAST(HOUR(a) AS UNSIGNED)
+t1f_ps	int(2) unsigned	CAST(? AS UNSIGNED)
+t1e_nm	int(3)	CAST(EXTRACT(HOUR FROM a) AS SIGNED)
+t1e_ps	int(3)	CAST(? AS SIGNED)
+t1f_nm	int(3)	CAST(HOUR(a) AS SIGNED)
+t1f_ps	int(3)	CAST(? AS SIGNED)
+t1e_nm	int(3)	ABS(EXTRACT(HOUR FROM a))
+t1e_ps	int(3)	ABS(?)
+t1f_nm	int(3)	ABS(HOUR(a))
+t1f_ps	int(3)	ABS(?)
+t1e_nm	int(3)	ROUND(EXTRACT(HOUR FROM a))
+t1e_ps	int(3)	ROUND(?)
+t1f_nm	int(3)	ROUND(HOUR(a))
+t1f_ps	int(3)	ROUND(?)
+t1e_nm	int(4)	-EXTRACT(HOUR FROM a)
+t1e_ps	int(4)	-?
+t1f_nm	int(3)	-HOUR(a)
+t1f_ps	int(3)	-?
+t1e_nm	int(4)	ROUND(EXTRACT(HOUR FROM a),-1)
+t1e_ps	int(4)	ROUND(?,-1)
+t1f_nm	int(4)	ROUND(HOUR(a),-1)
+t1f_ps	int(4)	ROUND(?,-1)
+t1e_nm	int(4)	EXTRACT(HOUR FROM a)+0
+t1e_ps	int(4)	?+0
+t1f_nm	int(4)	HOUR(a)+0
+t1f_ps	int(4)	?+0
+t1e_nm	decimal(4,1)	EXTRACT(HOUR FROM a)+0.0
+t1e_ps	decimal(4,1)	?+0.0
+t1f_nm	decimal(4,1)	HOUR(a)+0.0
+t1f_ps	decimal(4,1)	?+0.0
+t1e_nm	varchar(3)	CONCAT(EXTRACT(HOUR FROM a))
+t1e_ps	varchar(3)	CONCAT(?)
+t1f_nm	varchar(2)	CONCAT(HOUR(a))
+t1f_ps	varchar(2)	CONCAT(?)
+t1e_nm	int(3)	LEAST(EXTRACT(HOUR FROM a),EXTRACT(HOUR FROM a))
+t1e_ps	int(3)	LEAST(?,?)
+t1f_nm	int(3)	LEAST(HOUR(a),HOUR(a))
+t1f_ps	int(3)	LEAST(?,?)
+t1e_nm	int(3)	COALESCE(EXTRACT(HOUR FROM a))
+t1e_ps	int(3)	COALESCE(?)
+t1f_nm	int(3)	COALESCE(HOUR(a))
+t1f_ps	int(3)	COALESCE(?)
+t1e_nm	int(3)	COALESCE(EXTRACT(HOUR FROM a),CAST(1 AS SIGNED))
+t1e_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1f_nm	int(3)	COALESCE(HOUR(a),CAST(1 AS SIGNED))
+t1f_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1e_nm	decimal(2,0)	COALESCE(EXTRACT(HOUR FROM a),CAST(1 AS UNSIGNED))
+t1e_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1f_nm	decimal(2,0)	COALESCE(HOUR(a),CAST(1 AS UNSIGNED))
+t1f_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1e_nm	int(3)	@a:=EXTRACT(HOUR FROM a)
+t1e_ps	int(3)	@a:=?
+t1f_nm	int(3)	@a:=HOUR(a)
+t1f_ps	int(3)	@a:=?
+t2e_nm	decimal(6,4)	AVG(EXTRACT(HOUR FROM a))
+t2e_ps	decimal(6,4)	AVG(?)
+t2f_nm	decimal(6,4)	AVG(HOUR(a))
+t2f_ps	decimal(6,4)	AVG(?)
+t2e_nm	bigint(3)	MIN(EXTRACT(HOUR FROM a))
+t2e_ps	bigint(3)	MIN(?)
+t2f_nm	bigint(3)	MIN(HOUR(a))
+t2f_ps	bigint(3)	MIN(?)
+t2e_nm	bigint(3)	MAX(EXTRACT(HOUR FROM a))
+t2e_ps	bigint(3)	MAX(?)
+t2f_nm	bigint(3)	MAX(HOUR(a))
+t2f_ps	bigint(3)	MAX(?)
+t2e_nm	mediumtext	GROUP_CONCAT(EXTRACT(HOUR FROM a))
+t2e_ps	mediumtext	GROUP_CONCAT(?)
+t2f_nm	mediumtext	GROUP_CONCAT(HOUR(a))
+t2f_ps	mediumtext	GROUP_CONCAT(?)
+
+
+# EXTRACT(MINUTE FROM expr) includes the sign for TIME
+# MINUTE(expr) returns the absolute value
+CALL p1('MINUTE');
+EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MINUTE FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999'), MINUTE(TIMESTAMP'2001-12-13 10:20:30.999999');
+CALL show_drop;
+TABLE_NAME	COLUMN_TYPE	COLUMN_NAME
+t1e_nm	int(3)	EXTRACT(MINUTE FROM a)
+t1e_ps	int(3)	?
+t1f_nm	int(3)	MINUTE(a)
+t1f_ps	int(3)	?
+t1e_nm	bigint(20) unsigned	CAST(EXTRACT(MINUTE FROM a) AS UNSIGNED)
+t1e_ps	bigint(20) unsigned	CAST(? AS UNSIGNED)
+t1f_nm	int(2) unsigned	CAST(MINUTE(a) AS UNSIGNED)
+t1f_ps	int(2) unsigned	CAST(? AS UNSIGNED)
+t1e_nm	int(3)	CAST(EXTRACT(MINUTE FROM a) AS SIGNED)
+t1e_ps	int(3)	CAST(? AS SIGNED)
+t1f_nm	int(3)	CAST(MINUTE(a) AS SIGNED)
+t1f_ps	int(3)	CAST(? AS SIGNED)
+t1e_nm	int(3)	ABS(EXTRACT(MINUTE FROM a))
+t1e_ps	int(3)	ABS(?)
+t1f_nm	int(3)	ABS(MINUTE(a))
+t1f_ps	int(3)	ABS(?)
+t1e_nm	int(3)	ROUND(EXTRACT(MINUTE FROM a))
+t1e_ps	int(3)	ROUND(?)
+t1f_nm	int(3)	ROUND(MINUTE(a))
+t1f_ps	int(3)	ROUND(?)
+t1e_nm	int(4)	-EXTRACT(MINUTE FROM a)
+t1e_ps	int(4)	-?
+t1f_nm	int(3)	-MINUTE(a)
+t1f_ps	int(3)	-?
+t1e_nm	int(4)	ROUND(EXTRACT(MINUTE FROM a),-1)
+t1e_ps	int(4)	ROUND(?,-1)
+t1f_nm	int(4)	ROUND(MINUTE(a),-1)
+t1f_ps	int(4)	ROUND(?,-1)
+t1e_nm	int(4)	EXTRACT(MINUTE FROM a)+0
+t1e_ps	int(4)	?+0
+t1f_nm	int(4)	MINUTE(a)+0
+t1f_ps	int(4)	?+0
+t1e_nm	decimal(4,1)	EXTRACT(MINUTE FROM a)+0.0
+t1e_ps	decimal(4,1)	?+0.0
+t1f_nm	decimal(4,1)	MINUTE(a)+0.0
+t1f_ps	decimal(4,1)	?+0.0
+t1e_nm	varchar(3)	CONCAT(EXTRACT(MINUTE FROM a))
+t1e_ps	varchar(3)	CONCAT(?)
+t1f_nm	varchar(2)	CONCAT(MINUTE(a))
+t1f_ps	varchar(2)	CONCAT(?)
+t1e_nm	int(3)	LEAST(EXTRACT(MINUTE FROM a),EXTRACT(MINUTE FROM a))
+t1e_ps	int(3)	LEAST(?,?)
+t1f_nm	int(3)	LEAST(MINUTE(a),MINUTE(a))
+t1f_ps	int(3)	LEAST(?,?)
+t1e_nm	int(3)	COALESCE(EXTRACT(MINUTE FROM a))
+t1e_ps	int(3)	COALESCE(?)
+t1f_nm	int(3)	COALESCE(MINUTE(a))
+t1f_ps	int(3)	COALESCE(?)
+t1e_nm	int(3)	COALESCE(EXTRACT(MINUTE FROM a),CAST(1 AS SIGNED))
+t1e_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1f_nm	int(3)	COALESCE(MINUTE(a),CAST(1 AS SIGNED))
+t1f_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1e_nm	decimal(2,0)	COALESCE(EXTRACT(MINUTE FROM a),CAST(1 AS UNSIGNED))
+t1e_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1f_nm	decimal(2,0)	COALESCE(MINUTE(a),CAST(1 AS UNSIGNED))
+t1f_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1e_nm	int(3)	@a:=EXTRACT(MINUTE FROM a)
+t1e_ps	int(3)	@a:=?
+t1f_nm	int(3)	@a:=MINUTE(a)
+t1f_ps	int(3)	@a:=?
+t2e_nm	decimal(6,4)	AVG(EXTRACT(MINUTE FROM a))
+t2e_ps	decimal(6,4)	AVG(?)
+t2f_nm	decimal(6,4)	AVG(MINUTE(a))
+t2f_ps	decimal(6,4)	AVG(?)
+t2e_nm	bigint(3)	MIN(EXTRACT(MINUTE FROM a))
+t2e_ps	bigint(3)	MIN(?)
+t2f_nm	bigint(3)	MIN(MINUTE(a))
+t2f_ps	bigint(3)	MIN(?)
+t2e_nm	bigint(3)	MAX(EXTRACT(MINUTE FROM a))
+t2e_ps	bigint(3)	MAX(?)
+t2f_nm	bigint(3)	MAX(MINUTE(a))
+t2f_ps	bigint(3)	MAX(?)
+t2e_nm	mediumtext	GROUP_CONCAT(EXTRACT(MINUTE FROM a))
+t2e_ps	mediumtext	GROUP_CONCAT(?)
+t2f_nm	mediumtext	GROUP_CONCAT(MINUTE(a))
+t2f_ps	mediumtext	GROUP_CONCAT(?)
+
+
+# EXTRACT(SECONDS FROM expr) includes the sign for TIME
+# SECONDS(expr) returns the absolute value
+CALL p1('SECOND');
+EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(SECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), SECOND(TIMESTAMP'2001-12-13 10:20:30.999999');
+CALL show_drop;
+TABLE_NAME	COLUMN_TYPE	COLUMN_NAME
+t1e_nm	int(3)	EXTRACT(SECOND FROM a)
+t1e_ps	int(3)	?
+t1f_nm	int(3)	SECOND(a)
+t1f_ps	int(3)	?
+t1e_nm	bigint(20) unsigned	CAST(EXTRACT(SECOND FROM a) AS UNSIGNED)
+t1e_ps	bigint(20) unsigned	CAST(? AS UNSIGNED)
+t1f_nm	int(2) unsigned	CAST(SECOND(a) AS UNSIGNED)
+t1f_ps	int(2) unsigned	CAST(? AS UNSIGNED)
+t1e_nm	int(3)	CAST(EXTRACT(SECOND FROM a) AS SIGNED)
+t1e_ps	int(3)	CAST(? AS SIGNED)
+t1f_nm	int(3)	CAST(SECOND(a) AS SIGNED)
+t1f_ps	int(3)	CAST(? AS SIGNED)
+t1e_nm	int(3)	ABS(EXTRACT(SECOND FROM a))
+t1e_ps	int(3)	ABS(?)
+t1f_nm	int(3)	ABS(SECOND(a))
+t1f_ps	int(3)	ABS(?)
+t1e_nm	int(3)	ROUND(EXTRACT(SECOND FROM a))
+t1e_ps	int(3)	ROUND(?)
+t1f_nm	int(3)	ROUND(SECOND(a))
+t1f_ps	int(3)	ROUND(?)
+t1e_nm	int(4)	-EXTRACT(SECOND FROM a)
+t1e_ps	int(4)	-?
+t1f_nm	int(3)	-SECOND(a)
+t1f_ps	int(3)	-?
+t1e_nm	int(4)	ROUND(EXTRACT(SECOND FROM a),-1)
+t1e_ps	int(4)	ROUND(?,-1)
+t1f_nm	int(4)	ROUND(SECOND(a),-1)
+t1f_ps	int(4)	ROUND(?,-1)
+t1e_nm	int(4)	EXTRACT(SECOND FROM a)+0
+t1e_ps	int(4)	?+0
+t1f_nm	int(4)	SECOND(a)+0
+t1f_ps	int(4)	?+0
+t1e_nm	decimal(4,1)	EXTRACT(SECOND FROM a)+0.0
+t1e_ps	decimal(4,1)	?+0.0
+t1f_nm	decimal(4,1)	SECOND(a)+0.0
+t1f_ps	decimal(4,1)	?+0.0
+t1e_nm	varchar(3)	CONCAT(EXTRACT(SECOND FROM a))
+t1e_ps	varchar(3)	CONCAT(?)
+t1f_nm	varchar(2)	CONCAT(SECOND(a))
+t1f_ps	varchar(2)	CONCAT(?)
+t1e_nm	int(3)	LEAST(EXTRACT(SECOND FROM a),EXTRACT(SECOND FROM a))
+t1e_ps	int(3)	LEAST(?,?)
+t1f_nm	int(3)	LEAST(SECOND(a),SECOND(a))
+t1f_ps	int(3)	LEAST(?,?)
+t1e_nm	int(3)	COALESCE(EXTRACT(SECOND FROM a))
+t1e_ps	int(3)	COALESCE(?)
+t1f_nm	int(3)	COALESCE(SECOND(a))
+t1f_ps	int(3)	COALESCE(?)
+t1e_nm	int(3)	COALESCE(EXTRACT(SECOND FROM a),CAST(1 AS SIGNED))
+t1e_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1f_nm	int(3)	COALESCE(SECOND(a),CAST(1 AS SIGNED))
+t1f_ps	int(3)	COALESCE(?,CAST(1 AS SIGNED))
+t1e_nm	decimal(2,0)	COALESCE(EXTRACT(SECOND FROM a),CAST(1 AS UNSIGNED))
+t1e_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1f_nm	decimal(2,0)	COALESCE(SECOND(a),CAST(1 AS UNSIGNED))
+t1f_ps	decimal(2,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1e_nm	int(3)	@a:=EXTRACT(SECOND FROM a)
+t1e_ps	int(3)	@a:=?
+t1f_nm	int(3)	@a:=SECOND(a)
+t1f_ps	int(3)	@a:=?
+t2e_nm	decimal(6,4)	AVG(EXTRACT(SECOND FROM a))
+t2e_ps	decimal(6,4)	AVG(?)
+t2f_nm	decimal(6,4)	AVG(SECOND(a))
+t2f_ps	decimal(6,4)	AVG(?)
+t2e_nm	bigint(3)	MIN(EXTRACT(SECOND FROM a))
+t2e_ps	bigint(3)	MIN(?)
+t2f_nm	bigint(3)	MIN(SECOND(a))
+t2f_ps	bigint(3)	MIN(?)
+t2e_nm	bigint(3)	MAX(EXTRACT(SECOND FROM a))
+t2e_ps	bigint(3)	MAX(?)
+t2f_nm	bigint(3)	MAX(SECOND(a))
+t2f_ps	bigint(3)	MAX(?)
+t2e_nm	mediumtext	GROUP_CONCAT(EXTRACT(SECOND FROM a))
+t2e_ps	mediumtext	GROUP_CONCAT(?)
+t2f_nm	mediumtext	GROUP_CONCAT(SECOND(a))
+t2f_ps	mediumtext	GROUP_CONCAT(?)
+
+
+# EXTRACT(MICROSECONDS FROM expr) includes the sign for TIME
+# MICROSECONDS(expr) returns the absolute value
+CALL p1('MICROSECOND');
+EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999'), EXTRACT(MICROSECOND FROM TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999'), MICROSECOND(TIMESTAMP'2001-12-13 10:20:30.999999');
+CALL show_drop;
+TABLE_NAME	COLUMN_TYPE	COLUMN_NAME
+t1e_nm	int(7)	EXTRACT(MICROSECOND FROM a)
+t1e_ps	int(7)	?
+t1f_nm	int(7)	MICROSECOND(a)
+t1f_ps	int(7)	?
+t1e_nm	bigint(20) unsigned	CAST(EXTRACT(MICROSECOND FROM a) AS UNSIGNED)
+t1e_ps	bigint(20) unsigned	CAST(? AS UNSIGNED)
+t1f_nm	int(6) unsigned	CAST(MICROSECOND(a) AS UNSIGNED)
+t1f_ps	int(6) unsigned	CAST(? AS UNSIGNED)
+t1e_nm	int(7)	CAST(EXTRACT(MICROSECOND FROM a) AS SIGNED)
+t1e_ps	int(7)	CAST(? AS SIGNED)
+t1f_nm	int(7)	CAST(MICROSECOND(a) AS SIGNED)
+t1f_ps	int(7)	CAST(? AS SIGNED)
+t1e_nm	int(7)	ABS(EXTRACT(MICROSECOND FROM a))
+t1e_ps	int(7)	ABS(?)
+t1f_nm	int(7)	ABS(MICROSECOND(a))
+t1f_ps	int(7)	ABS(?)
+t1e_nm	int(7)	ROUND(EXTRACT(MICROSECOND FROM a))
+t1e_ps	int(7)	ROUND(?)
+t1f_nm	int(7)	ROUND(MICROSECOND(a))
+t1f_ps	int(7)	ROUND(?)
+t1e_nm	int(8)	-EXTRACT(MICROSECOND FROM a)
+t1e_ps	int(8)	-?
+t1f_nm	int(7)	-MICROSECOND(a)
+t1f_ps	int(7)	-?
+t1e_nm	int(8)	ROUND(EXTRACT(MICROSECOND FROM a),-1)
+t1e_ps	int(8)	ROUND(?,-1)
+t1f_nm	int(8)	ROUND(MICROSECOND(a),-1)
+t1f_ps	int(8)	ROUND(?,-1)
+t1e_nm	int(8)	EXTRACT(MICROSECOND FROM a)+0
+t1e_ps	int(8)	?+0
+t1f_nm	int(8)	MICROSECOND(a)+0
+t1f_ps	int(8)	?+0
+t1e_nm	decimal(8,1)	EXTRACT(MICROSECOND FROM a)+0.0
+t1e_ps	decimal(8,1)	?+0.0
+t1f_nm	decimal(8,1)	MICROSECOND(a)+0.0
+t1f_ps	decimal(8,1)	?+0.0
+t1e_nm	varchar(7)	CONCAT(EXTRACT(MICROSECOND FROM a))
+t1e_ps	varchar(7)	CONCAT(?)
+t1f_nm	varchar(6)	CONCAT(MICROSECOND(a))
+t1f_ps	varchar(6)	CONCAT(?)
+t1e_nm	int(7)	LEAST(EXTRACT(MICROSECOND FROM a),EXTRACT(MICROSECOND FROM a))
+t1e_ps	int(7)	LEAST(?,?)
+t1f_nm	int(7)	LEAST(MICROSECOND(a),MICROSECOND(a))
+t1f_ps	int(7)	LEAST(?,?)
+t1e_nm	int(7)	COALESCE(EXTRACT(MICROSECOND FROM a))
+t1e_ps	int(7)	COALESCE(?)
+t1f_nm	int(7)	COALESCE(MICROSECOND(a))
+t1f_ps	int(7)	COALESCE(?)
+t1e_nm	int(7)	COALESCE(EXTRACT(MICROSECOND FROM a),CAST(1 AS SIGNED))
+t1e_ps	int(7)	COALESCE(?,CAST(1 AS SIGNED))
+t1f_nm	int(7)	COALESCE(MICROSECOND(a),CAST(1 AS SIGNED))
+t1f_ps	int(7)	COALESCE(?,CAST(1 AS SIGNED))
+t1e_nm	decimal(6,0)	COALESCE(EXTRACT(MICROSECOND FROM a),CAST(1 AS UNSIGNED))
+t1e_ps	decimal(6,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1f_nm	decimal(6,0)	COALESCE(MICROSECOND(a),CAST(1 AS UNSIGNED))
+t1f_ps	decimal(6,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1e_nm	int(7)	@a:=EXTRACT(MICROSECOND FROM a)
+t1e_ps	int(7)	@a:=?
+t1f_nm	int(7)	@a:=MICROSECOND(a)
+t1f_ps	int(7)	@a:=?
+t2e_nm	decimal(10,4)	AVG(EXTRACT(MICROSECOND FROM a))
+t2e_ps	decimal(10,4)	AVG(?)
+t2f_nm	decimal(10,4)	AVG(MICROSECOND(a))
+t2f_ps	decimal(10,4)	AVG(?)
+t2e_nm	bigint(7)	MIN(EXTRACT(MICROSECOND FROM a))
+t2e_ps	bigint(7)	MIN(?)
+t2f_nm	bigint(7)	MIN(MICROSECOND(a))
+t2f_ps	bigint(7)	MIN(?)
+t2e_nm	bigint(7)	MAX(EXTRACT(MICROSECOND FROM a))
+t2e_ps	bigint(7)	MAX(?)
+t2f_nm	bigint(7)	MAX(MICROSECOND(a))
+t2f_ps	bigint(7)	MAX(?)
+t2e_nm	mediumtext	GROUP_CONCAT(EXTRACT(MICROSECOND FROM a))
+t2e_ps	mediumtext	GROUP_CONCAT(?)
+t2f_nm	mediumtext	GROUP_CONCAT(MICROSECOND(a))
+t2f_ps	mediumtext	GROUP_CONCAT(?)
+
+
+# DAYOFYEAR
+CALL p1('DAYOFYEAR');
+EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?' USING DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999');
+EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?)' USING DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999'), DAYOFYEAR(TIMESTAMP'2001-12-13 10:20:30.999999');
+CALL show_drop;
+TABLE_NAME	COLUMN_TYPE	COLUMN_NAME
+t1f_nm	int(4)	DAYOFYEAR(a)
+t1f_ps	int(4)	?
+t1f_nm	int(3) unsigned	CAST(DAYOFYEAR(a) AS UNSIGNED)
+t1f_ps	int(3) unsigned	CAST(? AS UNSIGNED)
+t1f_nm	int(4)	CAST(DAYOFYEAR(a) AS SIGNED)
+t1f_ps	int(4)	CAST(? AS SIGNED)
+t1f_nm	int(4)	ABS(DAYOFYEAR(a))
+t1f_ps	int(4)	ABS(?)
+t1f_nm	int(4)	ROUND(DAYOFYEAR(a))
+t1f_ps	int(4)	ROUND(?)
+t1f_nm	int(4)	-DAYOFYEAR(a)
+t1f_ps	int(4)	-?
+t1f_nm	int(5)	ROUND(DAYOFYEAR(a),-1)
+t1f_ps	int(5)	ROUND(?,-1)
+t1f_nm	int(5)	DAYOFYEAR(a)+0
+t1f_ps	int(5)	?+0
+t1f_nm	decimal(5,1)	DAYOFYEAR(a)+0.0
+t1f_ps	decimal(5,1)	?+0.0
+t1f_nm	varchar(3)	CONCAT(DAYOFYEAR(a))
+t1f_ps	varchar(3)	CONCAT(?)
+t1f_nm	int(4)	LEAST(DAYOFYEAR(a),DAYOFYEAR(a))
+t1f_ps	int(4)	LEAST(?,?)
+t1f_nm	int(4)	COALESCE(DAYOFYEAR(a))
+t1f_ps	int(4)	COALESCE(?)
+t1f_nm	int(4)	COALESCE(DAYOFYEAR(a),CAST(1 AS SIGNED))
+t1f_ps	int(4)	COALESCE(?,CAST(1 AS SIGNED))
+t1f_nm	decimal(3,0)	COALESCE(DAYOFYEAR(a),CAST(1 AS UNSIGNED))
+t1f_ps	decimal(3,0)	COALESCE(?,CAST(1 AS UNSIGNED))
+t1f_nm	int(4)	@a:=DAYOFYEAR(a)
+t1f_ps	int(4)	@a:=?
+t2f_nm	decimal(7,4)	AVG(DAYOFYEAR(a))
+t2f_ps	decimal(7,4)	AVG(?)
+t2f_nm	bigint(4)	MIN(DAYOFYEAR(a))
+t2f_ps	bigint(4)	MIN(?)
+t2f_nm	bigint(4)	MAX(DAYOFYEAR(a))
+t2f_ps	bigint(4)	MAX(?)
+t2f_nm	mediumtext	GROUP_CONCAT(DAYOFYEAR(a))
+t2f_ps	mediumtext	GROUP_CONCAT(?)
+DROP TABLE t1;
+DROP PROCEDURE p1;
+DROP PROCEDURE show_drop;
+DROP FUNCTION params;
+DROP FUNCTION select01;
+DROP FUNCTION select02;
+#
+# End of 10.5 tests
+#
diff --git a/mysql-test/main/func_extract.test b/mysql-test/main/func_extract.test
index 97920f1872f..dd808443f58 100644
--- a/mysql-test/main/func_extract.test
+++ b/mysql-test/main/func_extract.test
@@ -263,3 +263,254 @@ SELECT
 FROM t1;
 DROP TABLE t1;
 --enable_view_protocol
+
+
+--echo #
+--echo # Start of 10.5 tests
+--echo #
+
+--echo #
+--echo # MDEV-33496 Out of range error in AVG(YEAR(datetime)) due to a wrong data type
+--echo #
+
+let select01=SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?;
+let pcount01=16;
+let select02=SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?);
+let pcount02=4;
+let ts=TIMESTAMP'2001-12-13 10:20:30.999999';
+
+eval CREATE FUNCTION select01() RETURNS TEXT RETURN '$select01';
+eval CREATE FUNCTION select02() RETURNS TEXT RETURN '$select02';
+
+CREATE TABLE t1 (a DATETIME(6));
+INSERT INTO t1 VALUES ('2001-12-31 10:20:30.999999');
+
+DELIMITER $$;
+CREATE FUNCTION params(expr TEXT, count INT) RETURNS TEXT
+BEGIN
+  RETURN CONCAT(expr, REPEAT(CONCAT(', ', expr), count-1));
+END;
+$$
+CREATE PROCEDURE show_drop()
+BEGIN
+  SELECT TABLE_NAME, COLUMN_TYPE, COLUMN_NAME
+     FROM INFORMATION_SCHEMA.COLUMNS
+     WHERE TABLE_SCHEMA='test'
+     AND TABLE_NAME IN ('t1e_nm','t2e_nm','t1f_nm','t2f_nm',
+                        't1e_ps','t1f_ps','t2e_ps','t2f_ps')
+     ORDER BY LEFT(TABLE_NAME, 2), ORDINAL_POSITION, TABLE_NAME;
+
+  FOR rec IN (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
+              WHERE TABLE_SCHEMA='test'
+              AND TABLE_NAME IN ('t1e_nm','t2e_nm','t1f_nm','t2f_nm',
+                                 't1e_ps','t1f_ps','t2e_ps','t2f_ps'))
+  DO
+    EXECUTE IMMEDIATE CONCAT('DROP TABLE ', rec.TABLE_NAME);
+  END FOR;
+END;
+$$
+CREATE PROCEDURE p1(unit VARCHAR(32))
+BEGIN
+  DECLARE do_extract BOOL DEFAULT unit NOT IN('DAYOFYEAR');
+
+  DECLARE query01 TEXT DEFAULT
+                  CONCAT('CREATE TABLE t2 AS ', select01(), ' FROM t1');
+
+  DECLARE query02 TEXT DEFAULT
+                  CONCAT('CREATE TABLE t2 AS ', select02(), ' FROM t1');
+
+  IF (do_extract)
+  THEN
+    EXECUTE IMMEDIATE REPLACE(REPLACE(query01,'t2','t1e_nm'),'?', CONCAT('EXTRACT(',unit,' FROM a)'));
+    EXECUTE IMMEDIATE REPLACE(REPLACE(query02,'t2','t2e_nm'),'?', CONCAT('EXTRACT(',unit,' FROM a)'));
+  END IF;
+  EXECUTE IMMEDIATE REPLACE(REPLACE(query01,'t2','t1f_nm'),'?', CONCAT(unit,'(a)'));
+  EXECUTE IMMEDIATE REPLACE(REPLACE(query02,'t2','t2f_nm'),'?', CONCAT(unit,'(a)'));
+END;
+$$
+DELIMITER ;$$
+
+
+--echo
+--echo
+--echo # EXTRACT(YEAR FROM expr) and YEAR(expr) are equivalent
+
+CALL p1('YEAR');
+let extr=EXTRACT(YEAR FROM $ts);
+let func=YEAR($ts);
+let extr01=`SELECT params("$extr", $pcount01) AS p`;
+let func01=`SELECT params("$func", $pcount01) AS p`;
+let extr02=`SELECT params("$extr", $pcount02) AS p`;
+let func02=`SELECT params("$func", $pcount02) AS p`;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
+CALL show_drop;
+
+
+--echo
+--echo
+--echo # EXTRACT(QUARTER FROM expr) and QUARTER(expr) are equavalent
+
+CALL p1('QUARTER');
+let extr=EXTRACT(QUARTER FROM $ts);
+let func=QUARTER($ts);
+let extr01=`SELECT params("$extr", $pcount01) AS p`;
+let func01=`SELECT params("$func", $pcount01) AS p`;
+let extr02=`SELECT params("$extr", $pcount02) AS p`;
+let func02=`SELECT params("$func", $pcount02) AS p`;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
+CALL show_drop;
+
+--echo
+--echo
+--echo # EXTRACT(MONTH FROM expr) and MONTH(expr) are equavalent
+
+CALL p1('MONTH');
+let extr=EXTRACT(MONTH FROM $ts);
+let func=MONTH($ts);
+let extr01=`SELECT params("$extr", $pcount01) AS p`;
+let func01=`SELECT params("$func", $pcount01) AS p`;
+let extr02=`SELECT params("$extr", $pcount02) AS p`;
+let func02=`SELECT params("$func", $pcount02) AS p`;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
+CALL show_drop;
+
+--echo
+--echo
+--echo # EXTRACT(WEEK FROM expr) and WEEK(expr) are equavalent
+
+CALL p1('WEEK');
+let extr=EXTRACT(WEEK FROM $ts);
+let func=WEEK($ts);
+let extr01=`SELECT params("$extr", $pcount01) AS p`;
+let func01=`SELECT params("$func", $pcount01) AS p`;
+let extr02=`SELECT params("$extr", $pcount02) AS p`;
+let func02=`SELECT params("$func", $pcount02) AS p`;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
+CALL show_drop;
+
+--echo
+--echo
+--echo # EXTRACT(DAY FROM expr) returns hours/24 and includes the sign for TIME
+--echo # DAY(expr) returns the DD part of CAST(expr AS DATETIME)
+
+CALL p1('DAY');
+let extr=EXTRACT(DAY FROM $ts);
+let func=DAY($ts);
+let extr01=`SELECT params("$extr", $pcount01) AS p`;
+let func01=`SELECT params("$func", $pcount01) AS p`;
+let extr02=`SELECT params("$extr", $pcount02) AS p`;
+let func02=`SELECT params("$func", $pcount02) AS p`;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
+CALL show_drop;
+
+--echo
+--echo
+--echo # EXTRACT(HOUR FROM expr) returns hours%24 and includes the sign for TIME
+--echo # HOUR(expr) returns the hh part of CAST(expr AS DATETIME)
+
+CALL p1('HOUR');
+let extr=EXTRACT(HOUR FROM $ts);
+let func=HOUR($ts);
+let extr01=`SELECT params("$extr", $pcount01) AS p`;
+let func01=`SELECT params("$func", $pcount01) AS p`;
+let extr02=`SELECT params("$extr", $pcount02) AS p`;
+let func02=`SELECT params("$func", $pcount02) AS p`;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
+CALL show_drop;
+
+--echo
+--echo
+--echo # EXTRACT(MINUTE FROM expr) includes the sign for TIME
+--echo # MINUTE(expr) returns the absolute value
+
+CALL p1('MINUTE');
+let extr=EXTRACT(MINUTE FROM $ts);
+let func=MINUTE($ts);
+let extr01=`SELECT params("$extr", $pcount01) AS p`;
+let func01=`SELECT params("$func", $pcount01) AS p`;
+let extr02=`SELECT params("$extr", $pcount02) AS p`;
+let func02=`SELECT params("$func", $pcount02) AS p`;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
+CALL show_drop;
+
+--echo
+--echo
+--echo # EXTRACT(SECONDS FROM expr) includes the sign for TIME
+--echo # SECONDS(expr) returns the absolute value
+
+CALL p1('SECOND');
+let extr=EXTRACT(SECOND FROM $ts);
+let func=SECOND($ts);
+let extr01=`SELECT params("$extr", $pcount01) AS p`;
+let func01=`SELECT params("$func", $pcount01) AS p`;
+let extr02=`SELECT params("$extr", $pcount02) AS p`;
+let func02=`SELECT params("$func", $pcount02) AS p`;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
+CALL show_drop;
+
+--echo
+--echo
+--echo # EXTRACT(MICROSECONDS FROM expr) includes the sign for TIME
+--echo # MICROSECONDS(expr) returns the absolute value
+
+CALL p1('MICROSECOND');
+let extr=EXTRACT(MICROSECOND FROM $ts);
+let func=MICROSECOND($ts);
+let extr01=`SELECT params("$extr", $pcount01) AS p`;
+let func01=`SELECT params("$func", $pcount01) AS p`;
+let extr02=`SELECT params("$extr", $pcount02) AS p`;
+let func02=`SELECT params("$func", $pcount02) AS p`;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
+CALL show_drop;
+
+--echo
+--echo
+--echo # DAYOFYEAR
+
+CALL p1('DAYOFYEAR');
+let func=DAYOFYEAR($ts);
+let func01=`SELECT params("$func", $pcount01) AS p`;
+let func02=`SELECT params("$func", $pcount02) AS p`;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
+eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
+CALL show_drop;
+
+
+DROP TABLE t1;
+DROP PROCEDURE p1;
+DROP PROCEDURE show_drop;
+DROP FUNCTION params;
+
+DROP FUNCTION select01;
+DROP FUNCTION select02;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
diff --git a/mysql-test/main/func_time.result b/mysql-test/main/func_time.result
index e7ff2001711..0f807a691b3 100644
--- a/mysql-test/main/func_time.result
+++ b/mysql-test/main/func_time.result
@@ -3142,7 +3142,7 @@ Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is
 def	test	t1	t1	a	a	12	26	26	Y	128	6	63
 def					EXTRACT(YEAR FROM a)	3	4	4	Y	32896	0	63
 def					EXTRACT(YEAR_MONTH FROM a)	3	6	6	Y	32896	0	63
-def					EXTRACT(QUARTER FROM a)	3	2	1	Y	32896	0	63
+def					EXTRACT(QUARTER FROM a)	3	1	1	Y	32896	0	63
 def					EXTRACT(MONTH FROM a)	3	2	2	Y	32896	0	63
 def					EXTRACT(WEEK FROM a)	3	2	2	Y	32896	0	63
 def					EXTRACT(DAY FROM a)	3	3	2	Y	32896	0	63
@@ -3230,11 +3230,11 @@ SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` datetime(6) DEFAULT NULL,
-  `EXTRACT(YEAR FROM a)` int(4) DEFAULT NULL,
-  `EXTRACT(YEAR_MONTH FROM a)` int(6) DEFAULT NULL,
+  `EXTRACT(YEAR FROM a)` int(5) DEFAULT NULL,
+  `EXTRACT(YEAR_MONTH FROM a)` int(7) DEFAULT NULL,
   `EXTRACT(QUARTER FROM a)` int(2) DEFAULT NULL,
-  `EXTRACT(MONTH FROM a)` int(2) DEFAULT NULL,
-  `EXTRACT(WEEK FROM a)` int(2) DEFAULT NULL,
+  `EXTRACT(MONTH FROM a)` int(3) DEFAULT NULL,
+  `EXTRACT(WEEK FROM a)` int(3) DEFAULT NULL,
   `EXTRACT(DAY FROM a)` int(3) DEFAULT NULL,
   `EXTRACT(DAY_HOUR FROM a)` int(5) DEFAULT NULL,
   `EXTRACT(DAY_MINUTE FROM a)` int(7) DEFAULT NULL,
@@ -3281,7 +3281,7 @@ Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is
 def	test	t1	t1	a	a	11	17	17	Y	128	6	63
 def					EXTRACT(YEAR FROM a)	3	4	1	Y	32896	0	63
 def					EXTRACT(YEAR_MONTH FROM a)	3	6	1	Y	32896	0	63
-def					EXTRACT(QUARTER FROM a)	3	2	1	Y	32896	0	63
+def					EXTRACT(QUARTER FROM a)	3	1	1	Y	32896	0	63
 def					EXTRACT(MONTH FROM a)	3	2	1	Y	32896	0	63
 def					EXTRACT(WEEK FROM a)	3	2	9	Y	32896	0	63
 def					EXTRACT(DAY FROM a)	3	3	3	Y	32896	0	63
@@ -3411,11 +3411,11 @@ SHOW CREATE TABLE t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` time(6) DEFAULT NULL,
-  `EXTRACT(YEAR FROM a)` int(4) DEFAULT NULL,
-  `EXTRACT(YEAR_MONTH FROM a)` int(6) DEFAULT NULL,
+  `EXTRACT(YEAR FROM a)` int(5) DEFAULT NULL,
+  `EXTRACT(YEAR_MONTH FROM a)` int(7) DEFAULT NULL,
   `EXTRACT(QUARTER FROM a)` int(2) DEFAULT NULL,
-  `EXTRACT(MONTH FROM a)` int(2) DEFAULT NULL,
-  `EXTRACT(WEEK FROM a)` int(2) DEFAULT NULL,
+  `EXTRACT(MONTH FROM a)` int(3) DEFAULT NULL,
+  `EXTRACT(WEEK FROM a)` int(3) DEFAULT NULL,
   `EXTRACT(DAY FROM a)` int(3) DEFAULT NULL,
   `EXTRACT(DAY_HOUR FROM a)` int(5) DEFAULT NULL,
   `EXTRACT(DAY_MINUTE FROM a)` int(7) DEFAULT NULL,
diff --git a/mysql-test/main/ps_2myisam.result b/mysql-test/main/ps_2myisam.result
index 256665ce4cb..ec365498833 100644
--- a/mysql-test/main/ps_2myisam.result
+++ b/mysql-test/main/ps_2myisam.result
@@ -1798,7 +1798,7 @@ t5	CREATE TABLE `t5` (
   `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
-  `const11` int(4) DEFAULT NULL,
+  `const11` int(5) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
@@ -1828,7 +1828,7 @@ def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const10	const10	8	17	9	Y	32768	0	63
 def	test	t5	t5	param10	param10	8	20	9	Y	32768	0	63
-def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
+def	test	t5	t5	const11	const11	3	5	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
 def	test	t5	t5	param12	param12	8	20	0	Y	32768	0	63
diff --git a/mysql-test/main/ps_3innodb.result b/mysql-test/main/ps_3innodb.result
index 675587e020a..1c98a59cff5 100644
--- a/mysql-test/main/ps_3innodb.result
+++ b/mysql-test/main/ps_3innodb.result
@@ -1781,7 +1781,7 @@ t5	CREATE TABLE `t5` (
   `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
-  `const11` int(4) DEFAULT NULL,
+  `const11` int(5) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
@@ -1811,7 +1811,7 @@ def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const10	const10	8	17	9	Y	32768	0	63
 def	test	t5	t5	param10	param10	8	20	9	Y	32768	0	63
-def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
+def	test	t5	t5	const11	const11	3	5	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
 def	test	t5	t5	param12	param12	8	20	0	Y	32768	0	63
diff --git a/mysql-test/main/ps_4heap.result b/mysql-test/main/ps_4heap.result
index dcde7613bfe..db182536e93 100644
--- a/mysql-test/main/ps_4heap.result
+++ b/mysql-test/main/ps_4heap.result
@@ -1782,7 +1782,7 @@ t5	CREATE TABLE `t5` (
   `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
-  `const11` int(4) DEFAULT NULL,
+  `const11` int(5) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
@@ -1812,7 +1812,7 @@ def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const10	const10	8	17	9	Y	32768	0	63
 def	test	t5	t5	param10	param10	8	20	9	Y	32768	0	63
-def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
+def	test	t5	t5	const11	const11	3	5	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
 def	test	t5	t5	param12	param12	8	20	0	Y	32768	0	63
diff --git a/mysql-test/main/ps_5merge.result b/mysql-test/main/ps_5merge.result
index c9d33dbb1ae..963a3a60359 100644
--- a/mysql-test/main/ps_5merge.result
+++ b/mysql-test/main/ps_5merge.result
@@ -1719,7 +1719,7 @@ t5	CREATE TABLE `t5` (
   `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
-  `const11` int(4) DEFAULT NULL,
+  `const11` int(5) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
@@ -1749,7 +1749,7 @@ def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const10	const10	8	17	9	Y	32768	0	63
 def	test	t5	t5	param10	param10	8	20	9	Y	32768	0	63
-def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
+def	test	t5	t5	const11	const11	3	5	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
 def	test	t5	t5	param12	param12	8	20	0	Y	32768	0	63
@@ -5087,7 +5087,7 @@ t5	CREATE TABLE `t5` (
   `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
-  `const11` int(4) DEFAULT NULL,
+  `const11` int(5) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
@@ -5117,7 +5117,7 @@ def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const10	const10	8	17	9	Y	32768	0	63
 def	test	t5	t5	param10	param10	8	20	9	Y	32768	0	63
-def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
+def	test	t5	t5	const11	const11	3	5	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
 def	test	t5	t5	param12	param12	8	20	0	Y	32768	0	63
diff --git a/mysql-test/suite/maria/ps_maria.result b/mysql-test/suite/maria/ps_maria.result
index 5c128a32dd1..3f806c43dbd 100644
--- a/mysql-test/suite/maria/ps_maria.result
+++ b/mysql-test/suite/maria/ps_maria.result
@@ -1798,7 +1798,7 @@ t5	CREATE TABLE `t5` (
   `param09` longtext DEFAULT NULL,
   `const10` bigint(17) DEFAULT NULL,
   `param10` bigint(20) DEFAULT NULL,
-  `const11` int(4) DEFAULT NULL,
+  `const11` int(5) DEFAULT NULL,
   `param11` bigint(20) DEFAULT NULL,
   `const12` binary(0) DEFAULT NULL,
   `param12` bigint(20) DEFAULT NULL,
@@ -1828,7 +1828,7 @@ def	test	t5	t5	const09	const09	12	19	19	Y	128	0	63
 def	test	t5	t5	param09	param09	252	4294967295	19	Y	16	0	8
 def	test	t5	t5	const10	const10	8	17	9	Y	32768	0	63
 def	test	t5	t5	param10	param10	8	20	9	Y	32768	0	63
-def	test	t5	t5	const11	const11	3	4	4	Y	32768	0	63
+def	test	t5	t5	const11	const11	3	5	4	Y	32768	0	63
 def	test	t5	t5	param11	param11	8	20	4	Y	32768	0	63
 def	test	t5	t5	const12	const12	254	0	0	Y	128	0	63
 def	test	t5	t5	param12	param12	8	20	0	Y	32768	0	63
diff --git a/sql/item_func.cc b/sql/item_func.cc
index b3f12cec3af..f6fa613cba6 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1918,6 +1918,18 @@ void Item_func_abs::fix_length_and_dec_int()
   set_handler(type_handler_long_or_longlong());
 }
 
+void Item_func_abs::fix_length_and_dec_sint_ge0()
+{
+  /*
+    We're converting slong_ge0 to slong/slonglong.
+    Add one character for the sign into max_length.
+  */
+  max_length= args[0]->decimal_precision() + 1/*sign*/;
+  DBUG_ASSERT(!args[0]->unsigned_flag);
+  unsigned_flag= false;
+  set_handler(type_handler_long_or_longlong());
+}
+
 
 void Item_func_abs::fix_length_and_dec_double()
 {
@@ -2594,6 +2606,22 @@ void Item_func_round::fix_arg_int(const Type_handler *preferred,
 }
 
 
+void Item_func_round::fix_arg_slong_ge0()
+{
+  DBUG_ASSERT(!args[0]->unsigned_flag);
+  DBUG_ASSERT(args[0]->decimals == 0);
+  Type_std_attributes::set(args[0]);
+  /*
+    We're converting the data type from slong_ge0 to slong/slonglong.
+    Add one character for the sign,
+    to change max_length notation from "max_length digits" to
+    "max_length-1 digits and the sign".
+  */
+  max_length+= 1/*sign*/ + test_if_length_can_increase();
+  set_handler(type_handler_long_or_longlong());
+}
+
+
 void Item_func_round::fix_arg_hex_hybrid()
 {
   DBUG_ASSERT(args[0]->decimals == 0);
@@ -4801,7 +4829,9 @@ Item_func_set_user_var::fix_length_and_dec()
   if (args[0]->collation.derivation == DERIVATION_NUMERIC)
   {
     collation.set(DERIVATION_NUMERIC);
-    fix_length_and_charset(args[0]->max_char_length(), &my_charset_numeric);
+    uint sign_length= args[0]->type_handler() == &type_handler_slong_ge0 ? 1: 0;
+    fix_length_and_charset(args[0]->max_char_length() + sign_length,
+                           &my_charset_numeric);
   }
   else
   {
diff --git a/sql/item_func.h b/sql/item_func.h
index b205d457f1d..0f4f8928847 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1239,6 +1239,24 @@ public:
 };
 
 
+class Item_long_ge0_func: public Item_int_func
+{
+public:
+  Item_long_ge0_func(THD *thd): Item_int_func(thd) { }
+  Item_long_ge0_func(THD *thd, Item *a): Item_int_func(thd, a) {}
+  Item_long_ge0_func(THD *thd, Item *a, Item *b): Item_int_func(thd, a, b) {}
+  Item_long_ge0_func(THD *thd, Item *a, Item *b, Item *c): Item_int_func(thd, a, b, c) {}
+  Item_long_ge0_func(THD *thd, List<Item> &list): Item_int_func(thd, list) { }
+  Item_long_ge0_func(THD *thd, Item_long_ge0_func *item) :Item_int_func(thd, item) {}
+  const Type_handler *type_handler() const
+  {
+    DBUG_ASSERT(!unsigned_flag);
+    return &type_handler_slong_ge0;
+  }
+  bool fix_length_and_dec() { max_length= 10; return FALSE; }
+};
+
+
 class Item_func_hash: public Item_int_func
 {
 public:
@@ -1362,6 +1380,13 @@ public:
   {
     fix_char_length(MAX_BIGINT_WIDTH);
   }
+  void fix_length_and_dec_sint_ge0()
+  {
+    uint32 digits= args[0]->decimal_precision();
+    DBUG_ASSERT(digits > 0);
+    DBUG_ASSERT(digits <= MY_INT64_NUM_DECIMAL_DIGITS);
+    fix_char_length(digits + (unsigned_flag ? 0 : 1/*sign*/));
+  }
   void fix_length_and_dec_generic()
   {
     uint32 char_length= MY_MIN(args[0]->max_char_length(),
@@ -1723,6 +1748,7 @@ public:
   my_decimal *decimal_op(my_decimal *);
   const char *func_name() const { return "abs"; }
   void fix_length_and_dec_int();
+  void fix_length_and_dec_sint_ge0();
   void fix_length_and_dec_double();
   void fix_length_and_dec_decimal();
   bool fix_length_and_dec();
@@ -1981,6 +2007,7 @@ public:
   void fix_arg_int(const Type_handler *preferred,
                    const Type_std_attributes *preferred_attributes,
                    bool use_decimal_on_length_increase);
+  void fix_arg_slong_ge0();
   void fix_arg_hex_hybrid();
   void fix_arg_double();
   void fix_arg_time();
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index c3ff95ccf33..99e1d622bf8 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -1205,6 +1205,21 @@ bool Item_sum_hybrid::fix_length_and_dec_numeric(const Type_handler *handler)
 }
 
 
+bool Item_sum_hybrid::fix_length_and_dec_sint_ge0()
+{
+  // We don't have Item_field's of "ge0" type handlers.
+  DBUG_ASSERT(args[0]->real_item()->type() != FIELD_ITEM);
+  Type_std_attributes::set(args[0]);
+  /*
+    We're converting from e.g. slong_ge0 to slonglong
+    and need to add one extra character for the sign.
+  */
+  max_length++;
+  set_handler(&type_handler_slonglong);
+  return false;
+}
+
+
 /**
    MAX(str_field) converts ENUM/SET to CHAR, and preserve all other types
    for Fields.
diff --git a/sql/item_sum.h b/sql/item_sum.h
index 9f858725598..847407c6c0c 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -1115,6 +1115,7 @@ public:
   { return Type_handler_hybrid_field_type::type_handler(); }
   bool fix_length_and_dec_generic();
   bool fix_length_and_dec_numeric(const Type_handler *h);
+  bool fix_length_and_dec_sint_ge0();
   bool fix_length_and_dec_string();
 };
 
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 1672eee3443..a58f3593463 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2142,7 +2142,7 @@ bool Item_extract::fix_length_and_dec()
   switch (int_type) {
   case INTERVAL_YEAR:             set_date_length(4); break; // YYYY
   case INTERVAL_YEAR_MONTH:       set_date_length(6); break; // YYYYMM
-  case INTERVAL_QUARTER:          set_date_length(2); break; // 1..4
+  case INTERVAL_QUARTER:          set_date_length(1); break; // 1..4
   case INTERVAL_MONTH:            set_date_length(2); break; // MM
   case INTERVAL_WEEK:             set_date_length(2); break; // 0..52
   case INTERVAL_DAY:              set_day_length(daylen); break; // DD
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index a910b2cb723..d8012c74e05 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -30,23 +30,23 @@ bool get_interval_value(THD *thd, Item *args,
                         interval_type int_type, INTERVAL *interval);
 
 
-class Item_long_func_date_field: public Item_long_func
+class Item_long_func_date_field: public Item_long_ge0_func
 {
   bool check_arguments() const
   { return args[0]->check_type_can_return_date(func_name()); }
 public:
   Item_long_func_date_field(THD *thd, Item *a)
-   :Item_long_func(thd, a) { }
+   :Item_long_ge0_func(thd, a) { }
 };
 
 
-class Item_long_func_time_field: public Item_long_func
+class Item_long_func_time_field: public Item_long_ge0_func
 {
   bool check_arguments() const
   { return args[0]->check_type_can_return_time(func_name()); }
 public:
   Item_long_func_time_field(THD *thd, Item *a)
-   :Item_long_func(thd, a) { }
+   :Item_long_ge0_func(thd, a) { }
 };
 
 
@@ -166,10 +166,10 @@ public:
 };
 
 
-class Item_func_month :public Item_long_func
+class Item_func_month :public Item_long_ge0_func
 {
 public:
-  Item_func_month(THD *thd, Item *a): Item_long_func(thd, a)
+  Item_func_month(THD *thd, Item *a): Item_long_ge0_func(thd, a)
   { }
   longlong val_int();
   const char *func_name() const { return "month"; }
@@ -333,7 +333,7 @@ public:
 };
 
 
-class Item_func_week :public Item_long_func
+class Item_func_week :public Item_long_ge0_func
 {
   bool check_arguments() const
   {
@@ -341,8 +341,8 @@ class Item_func_week :public Item_long_func
            (arg_count > 1 && args[1]->check_type_can_return_int(func_name()));
   }
 public:
-  Item_func_week(THD *thd, Item *a): Item_long_func(thd, a) {}
-  Item_func_week(THD *thd, Item *a, Item *b): Item_long_func(thd, a, b) {}
+  Item_func_week(THD *thd, Item *a): Item_long_ge0_func(thd, a) {}
+  Item_func_week(THD *thd, Item *a, Item *b): Item_long_ge0_func(thd, a, b) {}
   longlong val_int();
   const char *func_name() const { return "week"; }
   bool fix_length_and_dec()
@@ -969,12 +969,17 @@ class Item_extract :public Item_int_func,
   void set_date_length(uint32 length)
   {
     /*
-      Although DATE components (e.g. YEAR, YEAR_MONTH, QUARTER, MONTH, WEEK)
-      cannot have a sign, we should probably still add +1,
-      because all around the code we assume that max_length is sign inclusive.
-      Another options is to set unsigned_flag to "true".
+      DATE components (e.g. YEAR, YEAR_MONTH, QUARTER, MONTH, WEEK)
+      return non-negative values but historically EXTRACT for date
+      components always returned the signed int data type.
+      So do equivalent functions YEAR(), QUARTER(), MONTH(), WEEK().
+      Let's set the data type to "signed int, but not negative",
+      so "this" produces better data types in VARCHAR and DECIMAL context
+      by using the fact that all of the max_length characters are spent
+      for digits (non of them are spent for the sign).
     */
-    set_handler(handler_by_length(max_length= length, 10)); // QQ: see above
+    set_handler(&type_handler_slong_ge0);
+    fix_char_length(length);
     m_date_mode= date_mode_t(0);
   }
   void set_day_length(uint32 length)
diff --git a/sql/sql_type.cc b/sql/sql_type.cc
index 77931b6cf16..9ede9e2582d 100644
--- a/sql/sql_type.cc
+++ b/sql/sql_type.cc
@@ -41,6 +41,7 @@ Named_type_handler<Type_handler_bool> type_handler_bool("boolean");
 Named_type_handler<Type_handler_tiny> type_handler_stiny("tinyint");
 Named_type_handler<Type_handler_short> type_handler_sshort("smallint");
 Named_type_handler<Type_handler_long> type_handler_slong("int");
+Named_type_handler<Type_handler_long_ge0> type_handler_slong_ge0("int");
 Named_type_handler<Type_handler_int24> type_handler_sint24("mediumint");
 Named_type_handler<Type_handler_longlong> type_handler_slonglong("bigint");
 Named_type_handler<Type_handler_utiny> type_handler_utiny("tiny unsigned");
@@ -4629,6 +4630,10 @@ bool Type_handler_general_purpose_int::
   bool unsigned_flag= items[0]->unsigned_flag;
   for (uint i= 1; i < nitems; i++)
   {
+    /*
+       TODO: avoid creating DECIMAL for a mix of ulong and slong_ge0.
+       It's too late for 10.5. Let's do it in a higher version.
+    */
     if (unsigned_flag != items[i]->unsigned_flag)
     {
       // Convert a mixture of signed and unsigned int to decimal
@@ -4638,6 +4643,21 @@ bool Type_handler_general_purpose_int::
     }
   }
   func->aggregate_attributes_int(items, nitems);
+  for (uint i= 0; i < nitems; i++)
+  {
+    if (items[i]->type_handler() == &type_handler_slong_ge0)
+    {
+      /*
+        A slong_ge0 argument found.
+        We need to add an extra character for the sign.
+        TODO: rewrite aggregate_attributes_int() to find
+        the maximum decimal_precision() instead of the maximum max_length.
+        This change is too late for 10.5, so let's do it in a higher version.
+      */
+      uint digits_and_sign= items[i]->decimal_precision() + 1;
+      set_if_bigger(func->max_length, digits_and_sign);
+    }
+  }
   handler->set_handler(func->unsigned_flag ?
                        handler->type_handler()->type_handler_unsigned() :
                        handler->type_handler()->type_handler_signed());
@@ -4931,6 +4951,13 @@ bool Type_handler_real_result::
 
 /*************************************************************************/
 
+bool Type_handler_long_ge0::
+       Item_sum_hybrid_fix_length_and_dec(Item_sum_hybrid *func)  const
+{
+  return func->fix_length_and_dec_sint_ge0();
+}
+
+
 bool Type_handler_int_result::
        Item_sum_hybrid_fix_length_and_dec(Item_sum_hybrid *func) const
 {
@@ -6373,6 +6400,14 @@ bool Type_handler_int_result::
 }
 
 
+bool Type_handler_long_ge0::
+       Item_func_round_fix_length_and_dec(Item_func_round *item) const
+{
+  item->fix_arg_slong_ge0();
+  return false;
+}
+
+
 bool Type_handler_year::
        Item_func_round_fix_length_and_dec(Item_func_round *item) const
 {
@@ -6594,6 +6629,14 @@ bool Type_handler_int_result::
 }
 
 
+bool Type_handler_long_ge0::
+       Item_func_abs_fix_length_and_dec(Item_func_abs *item) const
+{
+  item->fix_length_and_dec_sint_ge0();
+  return false;
+}
+
+
 bool Type_handler_real_result::
        Item_func_abs_fix_length_and_dec(Item_func_abs *item) const
 {
@@ -6704,6 +6747,22 @@ bool Type_handler::
 }
 
 
+bool Type_handler_long_ge0::
+       Item_func_signed_fix_length_and_dec(Item_func_signed *item) const
+{
+  item->fix_length_and_dec_sint_ge0();
+  return false;
+}
+
+
+bool Type_handler_long_ge0::
+       Item_func_unsigned_fix_length_and_dec(Item_func_unsigned *item) const
+{
+  item->fix_length_and_dec_sint_ge0();
+  return false;
+}
+
+
 bool Type_handler_string_result::
        Item_func_signed_fix_length_and_dec(Item_func_signed *item) const
 {
@@ -7189,6 +7248,18 @@ uint Type_handler_int_result::Item_decimal_precision(const Item *item) const
  return MY_MIN(prec, DECIMAL_MAX_PRECISION);
 }
 
+uint Type_handler_long_ge0::Item_decimal_precision(const Item *item) const
+{
+  DBUG_ASSERT(item->max_length);
+  DBUG_ASSERT(!item->decimals);
+  /*
+    Unlinke in Type_handler_long, Type_handler_long_ge does
+    not reserve one character for the sign. All max_length
+    characters are digits.
+  */
+  return MY_MIN(item->max_length, DECIMAL_MAX_PRECISION);
+}
+
 uint Type_handler_time_common::Item_decimal_precision(const Item *item) const
 {
   return 7 + MY_MIN(item->decimals, TIME_SECOND_PART_DIGITS);
@@ -8190,6 +8261,26 @@ Field *Type_handler_long::
 }
 
 
+Field *Type_handler_long_ge0::
+  make_table_field_from_def(TABLE_SHARE *share, MEM_ROOT *mem_root,
+                            const LEX_CSTRING *name,
+                            const Record_addr &rec, const Bit_addr &bit,
+                            const Column_definition_attributes *attr,
+                            uint32 flags) const
+{
+  /*
+    We're converting signed long_ge0 to signed long.
+    So add one character for the sign.
+  */
+  return new (mem_root)
+    Field_long(rec.ptr(), (uint32) attr->length + 1/*sign*/,
+               rec.null_ptr(), rec.null_bit(),
+               attr->unireg_check, name,
+               f_is_zerofill(attr->pack_flag) != 0,
+               f_is_dec(attr->pack_flag) == 0);
+}
+
+
 Field *Type_handler_longlong::
   make_table_field_from_def(TABLE_SHARE *share, MEM_ROOT *mem_root,
                             const LEX_CSTRING *name,
diff --git a/sql/sql_type.h b/sql/sql_type.h
index c8c92e56253..62bb8945b5b 100644
--- a/sql/sql_type.h
+++ b/sql/sql_type.h
@@ -5758,6 +5758,38 @@ public:
 };
 
 
+/*
+  The expression of this type reports itself as signed,
+  however it's known not to return negative values.
+  Items of this data type count only digits in Item::max_length,
+  without adding +1 for the sign. This allows expressions
+  of this type convert nicely to VARCHAR and DECIMAL.
+  For example, YEAR(now()) is:
+  - VARCHAR(4) in a string context
+  - DECIMAL(4,0) in a decimal context
+  - but INT(5) in an integer context
+*/
+class Type_handler_long_ge0: public Type_handler_long
+{
+public:
+  uint Item_decimal_precision(const Item *item) const override;
+  bool Item_func_signed_fix_length_and_dec(Item_func_signed *item)
+                                           const override;
+  bool Item_func_unsigned_fix_length_and_dec(Item_func_unsigned *item)
+                                             const override;
+  bool Item_func_abs_fix_length_and_dec(Item_func_abs *) const override;
+  bool Item_func_round_fix_length_and_dec(Item_func_round *) const override;
+  bool Item_sum_hybrid_fix_length_and_dec(Item_sum_hybrid *func) const override;
+  Field *make_table_field_from_def(TABLE_SHARE *share,
+                                   MEM_ROOT *mem_root,
+                                   const LEX_CSTRING *name,
+                                   const Record_addr &addr,
+                                   const Bit_addr &bit,
+                                   const Column_definition_attributes *attr,
+                                   uint32 flags) const override;
+};
+
+
 class Type_handler_ulong: public Type_handler_long
 {
 public:
@@ -7598,6 +7630,7 @@ extern MYSQL_PLUGIN_IMPORT Named_type_handler<Type_handler_tiny>        type_han
 extern MYSQL_PLUGIN_IMPORT Named_type_handler<Type_handler_short>       type_handler_sshort;
 extern MYSQL_PLUGIN_IMPORT Named_type_handler<Type_handler_int24>       type_handler_sint24;
 extern MYSQL_PLUGIN_IMPORT Named_type_handler<Type_handler_long>        type_handler_slong;
+extern MYSQL_PLUGIN_IMPORT Named_type_handler<Type_handler_long_ge0>    type_handler_slong_ge0;
 extern MYSQL_PLUGIN_IMPORT Named_type_handler<Type_handler_longlong>    type_handler_slonglong;
 
 extern Named_type_handler<Type_handler_utiny>       type_handler_utiny;