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

1 files changed, 12 insertions, 0 deletions

diff --git a/mysql-test/main/range.test b/mysql-test/main/range.test
index 0de13797da0..50ca94430e4 100644
--- a/mysql-test/main/range.test
+++ b/mysql-test/main/range.test
@@ -1253,14 +1253,23 @@ SELECT * FROM t1 WHERE a >= '2009:09:23 00:00:00';
 --echo # The former may give errors for the truncated values, while the latter
 --echo # gives warnings. The purpose of this test is not to interfere, and only
 --echo # preserve existing behavior.
+
+
+#view protocol generates additional warning
+--disable_view_protocol
+
 SELECT str_to_date('2007-10-00', '%Y-%m-%d') >= '' AND 
        str_to_date('2007-10-00', '%Y-%m-%d') <= '2007/10/20';
 
 SELECT str_to_date('2007-20-00', '%Y-%m-%d') >= '2007/10/20' AND 
        str_to_date('2007-20-00', '%Y-%m-%d') <= '';
+--enable_view_protocol
 
+#enable after fix MDEV-27871
+--disable_view_protocol
 SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20';
 SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '';
+--enable_view_protocol
 
 SELECT str_to_date('', '%Y-%m-%d');
 
@@ -1663,6 +1672,8 @@ INSERT INTO t1 (fd) SELECT fd FROM t1;
 INSERT INTO t1 (fd) SELECT fd FROM t1;
 INSERT INTO t1 (fd) SELECT fd FROM t1;
 INSERT INTO t1 (fd) SELECT fd FROM t1;
+#check after fix MDEV-29601
+--disable_service_connection
 --echo # The following should show "Impossible WHERE" :
 explain
 SELECT * FROM t1 WHERE fd='😁';
@@ -1673,6 +1684,7 @@ SELECT * FROM t1 WHERE fd='😁';
 explain select count(*) from t1 where fd <'😁';
 select count(*) from t1 where fd <'😁';
 select count(*) from t1 ignore index (ix_fd) where fd <'😁';
+--enable_service_connection
 
 drop table t1;
 set names default;