diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-18 11:44:47 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2017-01-18 11:44:47 -0500 |
commit | a3a91332d006fd39a32e1f6d4663e11515ea944b (patch) | |
tree | 560c152c9f8146a4c1bcd52ad2a2fa454be48aec /mysql-test/r/trigger.result | |
parent | 2805baf06c31dac21604148ec089300461790e3d (diff) | |
download | mariadb-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/r/trigger.result')
-rw-r--r-- | mysql-test/r/trigger.result | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/r/trigger.result b/mysql-test/r/trigger.result index 7c8cb5c46a6..8279e7a18b6 100644 --- a/mysql-test/r/trigger.result +++ b/mysql-test/r/trigger.result @@ -1316,6 +1316,7 @@ a b 2 b 3 c drop table t1; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE t1 ( id int NOT NULL DEFAULT '0', a varchar(10) NOT NULL, @@ -1348,6 +1349,7 @@ SELECT fubar_id FROM t2; fubar_id 1 DROP TABLE t1,t2; +SET sql_mode = DEFAULT; DROP TABLE IF EXISTS bug21825_A; DROP TABLE IF EXISTS bug21825_B; CREATE TABLE bug21825_A (id int(10)); @@ -2095,7 +2097,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; Warnings: Warning 1048 Column 'id' cannot be null Warning 1048 Column 'id' cannot be null @@ -2123,7 +2125,7 @@ CREATE TRIGGER trg1 BEFORE INSERT ON t2 FOR EACH ROW INSERT/*!INTO*/t1 VALUES (1 # Used to crash SHOW TRIGGERS IN db1; Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation -trg1 INSERT t2 CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t2 FOR EACH ROW INSERTINTOt1 VALUES (1) BEFORE # NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION latin1 latin1_swedish_ci latin1_swedish_ci +trg1 INSERT t2 CREATE DEFINER=`root`@`localhost` TRIGGER trg1 BEFORE INSERT ON t2 FOR EACH ROW INSERTINTOt1 VALUES (1) BEFORE # STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION latin1 latin1_swedish_ci latin1_swedish_ci INSERT INTO t2 VALUES (1); ERROR 42000: Trigger 'trg1' has an error in its body: 'You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'VALUES (1)' at line 1' SELECT * FROM t1; @@ -2178,6 +2180,7 @@ s1 DELETE FROM t1; DROP TABLE t1; DROP TEMPORARY TABLE t2; +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; DROP TRIGGER IF EXISTS trg1; DROP TABLE IF EXISTS t1; CREATE TABLE t1 (a INT); @@ -2205,6 +2208,7 @@ BEGIN DECLARE trg2 CHAR; SELECT 'ab' INTO trg2; END| +SET sql_mode = DEFAULT; INSERT INTO t1 VALUES (0); SELECT * FROM t1; a |