From 19cdddf17db22eb19626ffdd2565fe04a347af92 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 6 Jul 2023 13:49:06 +0400 Subject: [PATCH] A cleanup for MDEV-30932 UBSAN: negation of -X cannot be represented in type .. "mtr --view-protocol func_math" failed because of a too long column names imlicitly generated for the underlying expressions. With --view-protocol they were replaced to "Name_exp_1". Adding column aliases for these expressions. --- mysql-test/main/func_math.result | 8 ++++---- mysql-test/main/func_math.test | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mysql-test/main/func_math.result b/mysql-test/main/func_math.result index c3d7ee20f50..81d0395fe69 100644 --- a/mysql-test/main/func_math.result +++ b/mysql-test/main/func_math.result @@ -3566,11 +3566,11 @@ DROP TABLE t1; SELECT TRUNCATE(0, -9223372036854775808); TRUNCATE(0, -9223372036854775808) 0 -SELECT GET_FORMAT(TIME,'JIS') DIV ATAN (TRUNCATE (0,'2000000000000000' DIV SIN(1500)*NOW(5))); -GET_FORMAT(TIME,'JIS') DIV ATAN (TRUNCATE (0,'2000000000000000' DIV SIN(1500)*NOW(5))) +SELECT GET_FORMAT(TIME,'JIS') DIV ATAN (TRUNCATE (0,'2000000000000000' DIV SIN(1500)*NOW(5))) AS col1; +col1 NULL -SELECT (GET_FORMAT(TIME,'JIS') DIV ATAN (TRUNCATE (0,'2000000000000000' DIV SIN(1500)*NOW(5))/ROUND(-1)))DIV(-1-LOG2(1))-(-1*POWER(-1,0)); -(GET_FORMAT(TIME,'JIS') DIV ATAN (TRUNCATE (0,'2000000000000000' DIV SIN(1500)*NOW(5))/ROUND(-1)))DIV(-1-LOG2(1))-(-1*POWER(-1,0)) +SELECT (GET_FORMAT(TIME,'JIS') DIV ATAN (TRUNCATE (0,'2000000000000000' DIV SIN(1500)*NOW(5))/ROUND(-1)))DIV(-1-LOG2(1))-(-1*POWER(-1,0)) AS col1; +col1 NULL # # End of 10.4 tests diff --git a/mysql-test/main/func_math.test b/mysql-test/main/func_math.test index 4007f81fbee..9db00a54b80 100644 --- a/mysql-test/main/func_math.test +++ b/mysql-test/main/func_math.test @@ -1888,8 +1888,8 @@ DROP TABLE t1; SELECT TRUNCATE(0, -9223372036854775808); --disable_warnings -SELECT GET_FORMAT(TIME,'JIS') DIV ATAN (TRUNCATE (0,'2000000000000000' DIV SIN(1500)*NOW(5))); -SELECT (GET_FORMAT(TIME,'JIS') DIV ATAN (TRUNCATE (0,'2000000000000000' DIV SIN(1500)*NOW(5))/ROUND(-1)))DIV(-1-LOG2(1))-(-1*POWER(-1,0)); +SELECT GET_FORMAT(TIME,'JIS') DIV ATAN (TRUNCATE (0,'2000000000000000' DIV SIN(1500)*NOW(5))) AS col1; +SELECT (GET_FORMAT(TIME,'JIS') DIV ATAN (TRUNCATE (0,'2000000000000000' DIV SIN(1500)*NOW(5))/ROUND(-1)))DIV(-1-LOG2(1))-(-1*POWER(-1,0)) AS col1; --enable_warnings --echo #