diff --git a/mysql-test/columnstore/autopilot/r/mcs4090_function_CNX_EXTRACT_DM_Archived.result b/mysql-test/columnstore/autopilot/r/mcs4090_function_CNX_EXTRACT_DM_Archived.result
index 8b7c767ae..666839e46 100644
--- a/mysql-test/columnstore/autopilot/r/mcs4090_function_CNX_EXTRACT_DM_Archived.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4090_function_CNX_EXTRACT_DM_Archived.result
@@ -157,7 +157,7 @@ cidx	CTIME	EXTRACT(MINUTE_SECOND FROM CTIME)
 1	13:00:00	0
 select cidx, CTIME, EXTRACT(HOUR_MICROSECOND FROM CTIME) from datatypetestm order by cidx;
 cidx	CTIME	EXTRACT(HOUR_MICROSECOND FROM CTIME)
-1	13:00:00	1150981120
+1	13:00:00	130000000000
 select cidx, CTIME, EXTRACT(HOUR_SECOND FROM CTIME) from datatypetestm order by cidx;
 cidx	CTIME	EXTRACT(HOUR_SECOND FROM CTIME)
 1	13:00:00	130000
@@ -166,7 +166,7 @@ cidx	CTIME	EXTRACT(HOUR_MINUTE FROM CTIME)
 1	13:00:00	1300
 select cidx, CTIME, EXTRACT(DAY_MICROSECOND FROM CTIME) from datatypetestm order by cidx;
 cidx	CTIME	EXTRACT(DAY_MICROSECOND FROM CTIME)
-1	13:00:00	1150981120
+1	13:00:00	130000000000
 select cidx, CTIME, EXTRACT(DAY_SECOND FROM CTIME) from datatypetestm order by cidx;
 cidx	CTIME	EXTRACT(DAY_SECOND FROM CTIME)
 1	13:00:00	130000
diff --git a/mysql-test/columnstore/autopilot/r/mcs4219_function_CNX_TIMESTAMPDIFF_DM_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs4219_function_CNX_TIMESTAMPDIFF_DM_KnownIssue.result
index a488f7df2..c6db8407d 100644
--- a/mysql-test/columnstore/autopilot/r/mcs4219_function_CNX_TIMESTAMPDIFF_DM_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4219_function_CNX_TIMESTAMPDIFF_DM_KnownIssue.result
@@ -55,22 +55,22 @@ cidx	CDATETIME	TIMESTAMPDIFF(YEAR,CDATETIME, '2011-05-06 11:09:36')
 1	1997-01-01 00:00:00	14
 select cidx, CTIME, TIMESTAMPDIFF(MICROSECOND,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(MICROSECOND,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-2086818369232967680
+1	13:00:00	63471852576000000
 select cidx, CTIME, TIMESTAMPDIFF(SECOND,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(SECOND,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-2086818369232
+1	13:00:00	63471852576
 select cidx, CTIME, TIMESTAMPDIFF(MINUTE,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(MINUTE,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-34780306153
+1	13:00:00	1057864209
 select cidx, CTIME, TIMESTAMPDIFF(HOUR,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(HOUR,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-579671769
+1	13:00:00	17631070
 select cidx, CTIME, TIMESTAMPDIFF(DAY,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(DAY,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-24152990
+1	13:00:00	734627
 select cidx, CTIME, TIMESTAMPDIFF(WEEK,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(WEEK,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-3450427
+1	13:00:00	104946
 select cidx, CTIME, TIMESTAMPDIFF(MONTH,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(MONTH,CTIME, '2011-05-06 11:09:36')
 1	13:00:00	24137
diff --git a/mysql-test/columnstore/autopilot/r/mcs4315_function_CNXPP_EXTRACT_DM_Archived.result b/mysql-test/columnstore/autopilot/r/mcs4315_function_CNXPP_EXTRACT_DM_Archived.result
index e328f5e8f..8a0a0d07a 100644
--- a/mysql-test/columnstore/autopilot/r/mcs4315_function_CNXPP_EXTRACT_DM_Archived.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4315_function_CNXPP_EXTRACT_DM_Archived.result
@@ -157,7 +157,7 @@ cidx	CTIME	EXTRACT(MINUTE_SECOND FROM CTIME)
 1	13:00:00	0
 select cidx, CTIME, EXTRACT(HOUR_MICROSECOND FROM CTIME) from datatypetestm order by cidx;
 cidx	CTIME	EXTRACT(HOUR_MICROSECOND FROM CTIME)
-1	13:00:00	1150981120
+1	13:00:00	130000000000
 select cidx, CTIME, EXTRACT(HOUR_SECOND FROM CTIME) from datatypetestm order by cidx;
 cidx	CTIME	EXTRACT(HOUR_SECOND FROM CTIME)
 1	13:00:00	130000
@@ -166,7 +166,7 @@ cidx	CTIME	EXTRACT(HOUR_MINUTE FROM CTIME)
 1	13:00:00	1300
 select cidx, CTIME, EXTRACT(DAY_MICROSECOND FROM CTIME) from datatypetestm order by cidx;
 cidx	CTIME	EXTRACT(DAY_MICROSECOND FROM CTIME)
-1	13:00:00	1150981120
+1	13:00:00	130000000000
 select cidx, CTIME, EXTRACT(DAY_SECOND FROM CTIME) from datatypetestm order by cidx;
 cidx	CTIME	EXTRACT(DAY_SECOND FROM CTIME)
 1	13:00:00	130000
diff --git a/mysql-test/columnstore/autopilot/r/mcs4444_function_CNXPP_TIMESTAMPDIFF_DM_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs4444_function_CNXPP_TIMESTAMPDIFF_DM_KnownIssue.result
index efc67c0e1..558eedef1 100644
--- a/mysql-test/columnstore/autopilot/r/mcs4444_function_CNXPP_TIMESTAMPDIFF_DM_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs4444_function_CNXPP_TIMESTAMPDIFF_DM_KnownIssue.result
@@ -55,22 +55,22 @@ cidx	CDATETIME	TIMESTAMPDIFF(YEAR,CDATETIME, '2011-05-06 11:09:36')
 1	1997-01-01 00:00:00	14
 select cidx, CTIME, TIMESTAMPDIFF(MICROSECOND,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(MICROSECOND,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-2086818369232967680
+1	13:00:00	63471852576000000
 select cidx, CTIME, TIMESTAMPDIFF(SECOND,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(SECOND,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-2086818369232
+1	13:00:00	63471852576
 select cidx, CTIME, TIMESTAMPDIFF(MINUTE,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(MINUTE,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-34780306153
+1	13:00:00	1057864209
 select cidx, CTIME, TIMESTAMPDIFF(HOUR,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(HOUR,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-579671769
+1	13:00:00	17631070
 select cidx, CTIME, TIMESTAMPDIFF(DAY,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(DAY,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-24152990
+1	13:00:00	734627
 select cidx, CTIME, TIMESTAMPDIFF(WEEK,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(WEEK,CTIME, '2011-05-06 11:09:36')
-1	13:00:00	-3450427
+1	13:00:00	104946
 select cidx, CTIME, TIMESTAMPDIFF(MONTH,CTIME, '2011-05-06 11:09:36') from datatypetestm order by cidx;
 cidx	CTIME	TIMESTAMPDIFF(MONTH,CTIME, '2011-05-06 11:09:36')
 1	13:00:00	24137