Merge branch 'bb-10.3-all-builders' into bb-10.4-all-builders

1 files changed, 18 insertions, 0 deletions

diff --git a/mysql-test/main/func_math.test b/mysql-test/main/func_math.test
index 9398cde7f89..d65db5786a6 100644
--- a/mysql-test/main/func_math.test
+++ b/mysql-test/main/func_math.test
@@ -206,9 +206,15 @@ select floor(cast(-2 as unsigned)), floor(18446744073709551614), floor(-2);
 select format(cast(-2 as unsigned), 2), format(18446744073709551614, 2), format(-2, 2);
 select sqrt(cast(-2 as unsigned)), sqrt(18446744073709551614), sqrt(-2);
 select round(cast(-2 as unsigned), 1), round(18446744073709551614, 1), round(-2, 1);
+#view protocol generates additional warning
+--disable_view_protocol
 select round(4, cast(-2 as unsigned)), round(4, 18446744073709551614), round(4, -2);
+--enable_view_protocol
 select truncate(cast(-2 as unsigned), 1), truncate(18446744073709551614, 1), truncate(-2, 1);
+#view protocol generates additional warning
+--disable_view_protocol
 select truncate(4, cast(-2 as unsigned)), truncate(4, 18446744073709551614), truncate(4, -2);
+--enable_view_protocol
 select round(10000000000000000000, -19), truncate(10000000000000000000, -19);
 select round(1e0, -309), truncate(1e0, -309);
 select round(1e1,308), truncate(1e1, 308);
@@ -516,7 +522,10 @@ SELECT @a / 0.5;
 SELECT COT(1/0);
 SELECT -1 + 9223372036854775808;
 SELECT 2 DIV -2;
+#view protocol generates additional warning
+--disable_view_protocol
 SELECT -(1 DIV 0);
+--enable_view_protocol
 # Crashed the server with SIGFPE before the bugfix
 SELECT -9223372036854775808 MOD -1;
 
@@ -671,7 +680,10 @@ SELECT STDDEV_POP(ROUND(0,@A:=2009)) FROM (SELECT 1 UNION SELECT 2) fake_table;
 
 CREATE TABLE t1 ( pk int NOT NULL, i1 int NOT NULL, d1 date NOT NULL, t1 time);
 INSERT INTO t1 VALUES (7,9,'2007-08-15','03:55:02'),(8,7,'1993-06-05','04:17:51'),(9,7,'2034-07-01','17:31:12'),(10,0,'1998-08-24','08:09:27');
+#enable after fix MDEV-27871
+--disable_view_protocol
 SELECT DISTINCT  STDDEV_SAMP(EXPORT_SET(t1, -1379790335835635712, (i1 + 'o'), (MD5(d1)))) FROM t1;
+--enable_view_protocol
 DROP TABLE t1;
 
 CREATE TABLE t1 (a VARCHAR(128));
@@ -791,7 +803,10 @@ select 0=0, 0=-0, 0.0= -0.0, 0.0 = -(0.0), 0.0E1=-0.0E1, 0.0E1=-(0.0E1);
 --echo # CRC32 tests
 --echo #
 
+#enable after fix MDEV-28535
+--disable_view_protocol
 select CRC32(NULL), CRC32(''), CRC32('MySQL'), CRC32('mysql'), CRC32('01234567'), CRC32('012345678'), CRC32(REPEAT('ABCDEfghij', 20)), CRC32(REPEAT('0123456789', 200));
+--enable_view_protocol
 
 --echo #
 --echo # Start of 10.3 tests
@@ -844,7 +859,10 @@ SET sql_mode=DEFAULT;
 --echo # Bug#26495791 - EXPAND TEST SUITE TO INCLUDE CRC32 TESTS
 --echo #
 
+#enable after fix MDEV-28535
+--disable_view_protocol
 SELECT CRC32(NULL), CRC32(''), CRC32('MySQL'), CRC32('mysql');
+--enable_view_protocol
 SELECT CRC32('01234567'), CRC32('012345678');
 SELECT CRC32('~!@$%^*'),  CRC32('-0.0001');
 SELECT CRC32(99999999999999999999999999999999);