summaryrefslogtreecommitdiff
path: root/mysql-test/t/view.test
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2017-01-18 11:44:47 -0500
committerNirbhay Choubey <nirbhay@mariadb.com>2017-01-18 11:44:47 -0500
commita3a91332d006fd39a32e1f6d4663e11515ea944b (patch)
tree560c152c9f8146a4c1bcd52ad2a2fa454be48aec /mysql-test/t/view.test
parent2805baf06c31dac21604148ec089300461790e3d (diff)
downloadmariadb-git-bb-10.2-mdev7635.final.tar.gz
MDEV-7635: Update tests to adapt to the new default sql_modebb-10.2-mdev7635.savedbb-10.2-mdev7635.final
Diffstat (limited to 'mysql-test/t/view.test')
-rw-r--r--mysql-test/t/view.test7
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
index af509eb7b85..be7e5c56ea3 100644
--- a/mysql-test/t/view.test
+++ b/mysql-test/t/view.test
@@ -1222,6 +1222,7 @@ drop table t1;
#
# changing value by trigger and CHECK OPTION
#
+SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
create table t1 (s1 tinyint);
create trigger t1_bi before insert on t1 for each row set new.s1 = 500;
create view v1 as select * from t1 where s1 <> 127 with check option;
@@ -1232,7 +1233,7 @@ select * from t1;
drop trigger t1_bi;
drop view v1;
drop table t1;
-
+SET sql_mode = default;
#
# CASCADED should be used for all underlaying VIEWs
#
@@ -2678,7 +2679,7 @@ DROP TABLE t1,t2;
CREATE TABLE t1 (a INT NOT NULL, b INT NULL DEFAULT NULL);
CREATE VIEW v1 AS SELECT a, b FROM t1;
-INSERT INTO v1 (b) VALUES (2);
+INSERT IGNORE INTO v1 (b) VALUES (2);
SET SQL_MODE = STRICT_ALL_TABLES;
--error ER_NO_DEFAULT_FOR_VIEW_FIELD
@@ -3571,7 +3572,7 @@ DROP TABLE t1;
--echo #
create table t1(f1 int, f2 int not null);
create view v1 as select f1 from t1;
-insert into v1 values(1);
+insert ignore into v1 values(1);
set @old_mode=@@sql_mode;
set @@sql_mode=traditional;
--error ER_NO_DEFAULT_FOR_VIEW_FIELD