summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2016-05-30 00:12:50 +0300
committerElena Stepanova <elenst@montyprogram.com>2016-05-30 00:12:50 +0300
commit7013f86e406c6cfb7eabf01852991c6038c8a663 (patch)
treea76aa040c9f0f29a7aa4ef4d1207331543787a43
parent7166069537a4e18d4c0848655fcbc0c8ee568fd4 (diff)
downloadmariadb-git-7013f86e406c6cfb7eabf01852991c6038c8a663.tar.gz
Follow-up for the previous commit - result change for a big test
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_views-big.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/funcs_1/r/myisam_views-big.result b/mysql-test/suite/funcs_1/r/myisam_views-big.result
index 49f3c8fb133..c642a05b332 100644
--- a/mysql-test/suite/funcs_1/r/myisam_views-big.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views-big.result
@@ -4006,7 +4006,7 @@ Select @x;
0
CREATE or REPLACE VIEW v1 AS Select 1
FROM (SELECT 1 FROM t1) my_table;
-ERROR HY000: View's SELECT contains a subquery in the FROM clause
+DROP VIEW v1;
CREATE VIEW v1 AS SELECT f1 FROM t1;
CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW SET @a:=1 ;
SET @a:=0 ;
@@ -8356,7 +8356,7 @@ Testcase 3.3.1.39
Drop view if exists test.v1 ;
CREATE VIEW test.v1
AS Select f59 from (Select * FROM tb2 limit 20) tx ;
-ERROR HY000: View's SELECT contains a subquery in the FROM clause
+DROP VIEW test.v1;
SELECT * FROM test.v1 order by f59 ;
ERROR 42S02: Table 'test.v1' doesn't exist
Drop view if exists test.v1 ;