Merge branch 'bb-10.4-vp-MDEV-27691' into 10.4

1 files changed, 31 insertions, 0 deletions

diff --git a/mysql-test/main/func_debug.test b/mysql-test/main/func_debug.test
index 9ae24035e20..1fbc652bb48 100644
--- a/mysql-test/main/func_debug.test
+++ b/mysql-test/main/func_debug.test
@@ -24,11 +24,16 @@ SELECT 'a' IN ('a','b',NULL);
 SELECT 'a' NOT IN ('a','b');
 SELECT 'a' NOT IN ('a','b',NULL);
 
+#enable after fix MDEV-27871
+--disable_view_protocol
+
 SELECT TIMESTAMP'2001-01-01 10:20:30' IN ('2001-01-01 10:20:30','2001-02-02 10:20:30');
 SELECT TIMESTAMP'2001-01-01 10:20:30' IN ('2001-01-01 10:20:30','2001-02-02 10:20:30',NULL);
 SELECT TIMESTAMP'2001-01-01 10:20:30' NOT IN ('2001-01-01 10:20:30','2001-02-02 10:20:30');
 SELECT TIMESTAMP'2001-01-01 10:20:30' NOT IN ('2001-01-01 10:20:30','2001-02-02 10:20:30',NULL);
 
+--enable_view_protocol
+
 SELECT TIME'10:20:30' IN ('10:20:30','10:20:30');
 SELECT TIME'10:20:30' IN ('10:20:30','10:20:30',NULL);
 SELECT TIME'10:20:30' NOT IN ('10:20:30','10:20:30');
@@ -81,6 +86,9 @@ SELECT a NOT IN ('a','b','c') FROM t1;
 SELECT a NOT IN ('a','b','c',NULL) FROM t1;
 DROP TABLE t1;
 
+#enable after fix MDEV-27871
+--disable_view_protocol
+
 CREATE TABLE t1 (a DATE);
 SELECT a IN ('2001-01-01',DATE'2001-01-02',20010102,20010102.0,20010102e0) FROM t1;
 SELECT a IN ('2001-01-01',DATE'2001-01-02',20010102,20010102.0,20010102e0,NULL) FROM t1;
@@ -102,6 +110,8 @@ SELECT a NOT IN ('2001-01-01',TIMESTAMP'2001-01-01 10:20:30',DATE'2001-01-01',TI
 SELECT a NOT IN ('2001-01-01',TIMESTAMP'2001-01-01 10:20:30',DATE'2001-01-01',TIME'10:20:30',20010101102030,20010101102030.0,20010101102030e0,NULL) FROM t1;
 DROP TABLE t1;
 
+--enable_view_protocol
+
 --echo # Constant predicant, compatible types, no bisect
 --echo # Bisect is not used because of non-constant expressions in the list
 CREATE TABLE t1 (a INT);
@@ -146,6 +156,9 @@ SELECT TIME'10:20:30' NOT IN (a,'10:20:30') FROM t1;
 SELECT TIME'10:20:30' NOT IN (a,'10:20:30',NULL) FROM t1;
 DROP TABLE t1;
 
+#enable after fix MDEV-27871
+--disable_view_protocol
+
 CREATE TABLE t1 (a DATETIME);
 SELECT TIMESTAMP'2001-01-01 10:20:30' IN (a,TIMESTAMP'2001-01-01 10:20:30') FROM t1;
 SELECT TIMESTAMP'2001-01-01 10:20:30' IN (a,TIMESTAMP'2001-01-01 10:20:30',NULL) FROM t1;
@@ -153,6 +166,7 @@ SELECT TIMESTAMP'2001-01-01 10:20:30' NOT IN (a,TIMESTAMP'2001-01-01 10:20:30')
 SELECT TIMESTAMP'2001-01-01 10:20:30' NOT IN (a,TIMESTAMP'2001-01-01 10:20:30',NULL) FROM t1;
 DROP TABLE t1;
 
+--enable_view_protocol
 
 --echo # Constant predicant, incompatible types, no bisect
 SELECT 1 IN (1,2e0);
@@ -175,6 +189,9 @@ SELECT 'a' IN ('a',2,NULL);
 SELECT 'a' NOT IN ('a',2);
 SELECT 'a' NOT IN ('a',2,NULL);
 
+#enable after fix MDEV-27871
+--disable_view_protocol
+
 SELECT TIME'10:20:30' IN (1,TIME'10:20:30');
 SELECT TIME'10:20:30' IN (1,TIME'10:20:30',NULL);
 SELECT TIME'10:20:30' IN (102030, TIME'10:20:30',TIMESTAMP'2001-01-01 10:20:32');
@@ -203,6 +220,8 @@ SELECT a NOT IN (CAST(1 AS SIGNED), CAST(1 AS UNSIGNED),NULL) FROM t1;
 SELECT a NOT IN (CAST(1 AS DECIMAL),CAST(1 AS SIGNED), CAST(1 AS UNSIGNED)) FROM t1;
 SELECT a NOT IN (CAST(1 AS DECIMAL),CAST(1 AS SIGNED), CAST(1 AS UNSIGNED),NULL) FROM t1;
 
+--enable_view_protocol
+
 SELECT a IN (1,1.0) FROM t1;
 SELECT a IN (1,1.0,NULL) FROM t1;
 SELECT a NOT IN (1,1.0) FROM t1;
@@ -260,6 +279,9 @@ SELECT a NOT IN ('a',1) FROM t1;
 SELECT a NOT IN ('a',TIME'10:20:30') FROM t1;
 DROP TABLE t1;
 
+#enable after fix MDEV-27871
+--disable_view_protocol
+
 CREATE TABLE t1 (a TIME);
 SELECT a IN (102030, TIME'10:20:30',TIMESTAMP'2001-01-01 10:20:32') FROM t1;
 SELECT a IN (102030, TIME'10:20:30',TIMESTAMP'2001-01-01 10:20:32',NULL) FROM t1;
@@ -271,6 +293,8 @@ SELECT a NOT IN (102030, 102030, TIME'10:20:30',TIMESTAMP'2001-01-01 10:20:32')
 SELECT a NOT IN (102030, 102030, TIME'10:20:30',TIMESTAMP'2001-01-01 10:20:32',NULL) FROM t1;
 DROP TABLE t1;
 
+--enable_view_protocol
+
 #
 # ROW tests
 #
@@ -413,9 +437,13 @@ DROP TABLE t1;
 --echo #
 --echo # MDEV-11514 IN with a mixture of TIME and DATETIME returns a wrong result
 --echo #
+#enable after fix MDEV-27871
+--disable_view_protocol
 
 SELECT TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32');
 
+--enable_view_protocol
+
 PREPARE stmt FROM "SELECT
        TIME'10:20:30' IN (102030,TIME'10:20:31',TIMESTAMP'2001-01-01 10:20:32')";
 EXECUTE stmt;
@@ -502,7 +530,10 @@ SELECT * FROM t1 WHERE a BETWEEN 1 AND 1;
 SELECT * FROM t1 WHERE a BETWEEN 0 AND 1;
 SELECT * FROM t1 WHERE a BETWEEN 0 AND -1;
 SELECT * FROM t1 WHERE a BETWEEN -1 AND -1;
+#enable after fix MDEV-29524
+--disable_view_protocol
 SELECT * FROM t1 WHERE a BETWEEN -0000000000000001 AND -1;
+--enable_view_protocol
 SELECT * FROM t1 WHERE a BETWEEN -1 AND 18446744073709551615;
 SELECT * FROM t1 WHERE a BETWEEN -1 AND 18446744073709551616;
 SELECT * FROM t1 WHERE a BETWEEN 1e2 AND 100e0;