diff --git a/mysql-test/columnstore/basic/r/mcs94_math_functions.result b/mysql-test/columnstore/basic/r/mcs94_math_functions.result
index 45483d3fa..27f55903d 100644
--- a/mysql-test/columnstore/basic/r/mcs94_math_functions.result
+++ b/mysql-test/columnstore/basic/r/mcs94_math_functions.result
@@ -93,12 +93,12 @@ NULL	NULL	NULL	NULL
 -15	-0.7596879128588213	-202.19	0.42840437390108005
 -297	-0.11921006489861569	0.41	0.9171208228166051
 719	-0.9111551063193005	359.90	-0.18654198473652675
-SELECT a, COT(a), b, COT(b) FROM t1 WHERE a != 0;
-a	COT(a)	b	COT(b)
-1	0.6420926159343306	11.11	-0.11492774312870269
+SELECT a, COT(a), b, TRUNCATE(COT(b),16) FROM t1 WHERE a != 0;
+a	COT(a)	b	TRUNCATE(COT(b),16)
+1	0.6420926159343306	11.11	-0.1149277431287026
 10	1.5423510453569202	82.12	2.1319216370997434
--15	1.1682333052318372	-202.19	-0.47411518165716554
--297	0.12006625072585818	0.41	2.300801206670319
+-15	1.1682333052318372	-202.19	-0.4741151816571655
+-297	0.12006625072585818	0.41	2.3008012066703190
 719	-2.211200428423707	359.90	-0.1898748600763736
 SELECT a, CRC32(a), b, CRC32(b) FROM t1;
 a	CRC32(a)	b	CRC32(b)
@@ -244,15 +244,15 @@ NULL	NULL	NULL	NULL
 -15	NULL	-202.19	NULL
 -297	NULL	0.41	0.6403124237432849
 719	26.814175355583846	359.90	18.971030546599202
-SELECT a, TAN(a), b, TAN(b) FROM t1;
-a	TAN(a)	b	TAN(b)
+SELECT a, TAN(a), b, TRUNCATE(TAN(b), 14) FROM t1;
+a	TAN(a)	b	TRUNCATE(TAN(b), 14)
 NULL	NULL	NULL	NULL
-0	0	0.00	0
-1	1.5574077246549023	11.11	-8.701119266565103
-10	0.6483608274590866	82.12	0.46906039255757803
--15	0.8559934009085187	-202.19	-2.1091921091932124
--297	8.328735127102908	0.41	0.43463120459988946
-719	-0.4522430382816394	359.90	-5.266626659252145
+0	0	0.00	0.00000000000000
+1	1.5574077246549023	11.11	-8.70111926656510
+10	0.6483608274590866	82.12	0.46906039255757
+-15	0.8559934009085187	-202.19	-2.10919210919321
+-297	8.328735127102908	0.41	0.43463120459988
+719	-0.4522430382816394	359.90	-5.26662665925214
 SELECT a, TRUNCATE(a, 1) FROM t1;
 a	TRUNCATE(a, 1)
 NULL	NULL
diff --git a/mysql-test/columnstore/basic/t/mcs94_math_functions.test b/mysql-test/columnstore/basic/t/mcs94_math_functions.test
index 90df0cefd..85269819d 100644
--- a/mysql-test/columnstore/basic/t/mcs94_math_functions.test
+++ b/mysql-test/columnstore/basic/t/mcs94_math_functions.test
@@ -24,7 +24,7 @@ SELECT a, CONV(a, 10, 2)  FROM t1;
 SELECT a, CONV(a, 10, 8)  FROM t1;
 SELECT a, CONV(a, 10, 16)  FROM t1;
 SELECT a, COS(a), b, COS(b) FROM t1;
-SELECT a, COT(a), b, COT(b) FROM t1 WHERE a != 0;
+SELECT a, COT(a), b, TRUNCATE(COT(b),16) FROM t1 WHERE a != 0;
 SELECT a, CRC32(a), b, CRC32(b) FROM t1;
 SELECT a, DEGREES(a), b, DEGREES(b) FROM t1;
 SELECT a, EXP(1), b, EXP(b) FROM t1;
@@ -41,7 +41,7 @@ SELECT a, RAND(a), b, RAND(b) FROM t1;
 SELECT a, ROUND(a), b, ROUND(b) FROM t1;
 SELECT a, SIGN(a), b, SIGN(b) FROM t1;
 SELECT a, SQRT(a), b, SQRT(b) FROM t1;
-SELECT a, TAN(a), b, TAN(b) FROM t1;
+SELECT a, TAN(a), b, TRUNCATE(TAN(b), 14) FROM t1;
 SELECT a, TRUNCATE(a, 1) FROM t1;
 SELECT b, TRUNCATE(b, 1), TRUNCATE(b, 4), TRUNCATE(b, -1), TRUNCATE(b, -2), TRUNCATE(b, -3) FROM t1;