diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-08 15:28:00 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-02-10 06:30:42 -0500 |
| commit | 8b2e642aa214db729161252b96f36bfbae3add21 (patch) | |
| tree | 006dcc588623c7c7ee508eca3534259f62244f2c /mysql-test/t/trigger.test | |
| parent | f556aa9b5f3685dfcf1b365d2461316cbd16e169 (diff) | |
| download | mariadb-git-8b2e642aa214db729161252b96f36bfbae3add21.tar.gz | |
MDEV-7635: Update tests to adapt to the new default sql_mode
Diffstat (limited to 'mysql-test/t/trigger.test')
| -rw-r--r-- | mysql-test/t/trigger.test | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/t/trigger.test b/mysql-test/t/trigger.test index 050bd5ea56e..83b6966c676 100644 --- a/mysql-test/t/trigger.test +++ b/mysql-test/t/trigger.test @@ -2367,7 +2367,7 @@ DROP TABLE t1, t2; CREATE TABLE t1 (id INT NOT NULL); CREATE TABLE t2 (id INT NOT NULL); INSERT t1 VALUES (1),(2),(3); -UPDATE t1 SET id=NULL; +UPDATE IGNORE t1 SET id=NULL; CREATE TRIGGER t1_bu BEFORE UPDATE ON t1 FOR EACH ROW INSERT INTO t2 VALUES (3); UPDATE t1 SET id=NULL; @@ -2463,6 +2463,7 @@ DROP TEMPORARY TABLE t2; # Bug#36649: Condition area is not properly cleaned up after stored routine invocation # +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; --disable_warnings DROP TRIGGER IF EXISTS trg1; DROP TABLE IF EXISTS t1; @@ -2512,6 +2513,7 @@ BEGIN END| delimiter ;| +SET sql_mode = DEFAULT; INSERT INTO t1 VALUES (0); SELECT * FROM t1; |