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

1 files changed, 23 insertions, 0 deletions

diff --git a/mysql-test/main/table_value_constr.test b/mysql-test/main/table_value_constr.test
index 367ce9a4366..19af93e0137 100644
--- a/mysql-test/main/table_value_constr.test
+++ b/mysql-test/main/table_value_constr.test
@@ -1477,6 +1477,9 @@ execute stmt;
 execute stmt;
 deallocate prepare stmt;
 
+#enable after fix MDEV-28603
+--disable_view_protocol
+
 let $q2=
 select (values ((select * from t1 where a > 10))) from t2;
 eval $q2;
@@ -1513,6 +1516,8 @@ execute stmt;
 execute stmt;
 deallocate prepare stmt;
 
+--enable_view_protocol
+
 drop view v1;
 drop table t1,t2,t3;
 
@@ -1584,6 +1589,10 @@ values ((values (2))), ((values ((values (4)))))
 union all
 values ((values (8))), ((values ((select 4))));
 
+#A view definition cannot contain a subquery in the FROM clause 
+# in the SELECT statement
+--disable_view_protocol
+
 select * from (values ((values (2)))) dt;
 
 select * from (values ((values (2)), (5), (select 4))) dt;
@@ -1596,6 +1605,8 @@ select * from (values ((values (2))), ((values (3)))) dt;
 
 select * from (values ((values (2))), ((select 4)), ((values (3)))) dt;
 
+--enable_view_protocol
+
 create table t1 (a int);
 insert into t1 values (3), (7), (1);
 
@@ -1619,10 +1630,16 @@ values ((values ((select (values(2)) from t1 where a=8))));
 --error ER_SUBQUERY_NO_1_ROW
 values ((select (values(2)) from t1 where a<7));
 
+#A view definition cannot contain a subquery in the FROM clause 
+# in the SELECT statement
+--disable_view_protocol
+
 select * from (values ((values ((select a from t1 where a=7))))) dt;
 
 select * from (values ((values ((select (values(2)) from t1 where a=8))))) dt;
 
+--enable_view_protocol
+
 insert into t1(a) values ((values (2))), ((values (3)));
 select * from t1;
 
@@ -1633,6 +1650,10 @@ drop table t1;
 --echo # MDEV-25484: Derived table using TVC with LIMIT and ORDER BY
 --echo #
 
+#A view definition cannot contain a subquery in the FROM clause 
+# in the SELECT statement
+--disable_view_protocol
+
 create table t1 (a int);
 insert into t1 values (3), (7), (1);
 
@@ -1650,6 +1671,8 @@ select * from (values (3),(7),(1) union values (2),(4) order by 1 limit 2) as dt
 
 drop table t1;
 
+--enable_view_protocol
+
 --echo #
 --echo # MDEV-23182: Server crashes in
 --echo # Item::fix_fields_if_needed / table_value_constr::prepare upon 2nd execution of PS