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/suite/gcol/r/gcol_ins_upd_innodb.result | |
| 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/suite/gcol/r/gcol_ins_upd_innodb.result')
| -rw-r--r-- | mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result b/mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result index 192016ba8df..3c2e4d3dd0a 100644 --- a/mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result +++ b/mysql-test/suite/gcol/r/gcol_ins_upd_innodb.result @@ -23,7 +23,7 @@ delete from t1; select * from t1; a b c # INSERT INTO tbl_name VALUES... a non-NULL value is specified against gcols -insert into t1 values (1,2,3); +insert ignore into t1 values (1,2,3); Warnings: Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'c' in table 't1' ignored @@ -63,7 +63,7 @@ select * from t1; a b c # INSERT INTO tbl_name (<normal+gcols>) VALUES... a non-NULL value is specified # against gcols -insert into t1 (a,b) values (1,3), (2,4); +insert ignore into t1 (a,b) values (1,3), (2,4); Warnings: Warning 1906 The value specified for generated column 'b' in table 't1' ignored Warning 1906 The value specified for generated column 'b' in table 't1' ignored @@ -151,7 +151,7 @@ select * from t1 order by a; a b c 1 -1 -1 2 -2 -2 -update t1 set c=3 where a=2; +update ignore t1 set c=3 where a=2; Warnings: Warning 1906 The value specified for generated column 'c' in table 't1' ignored select * from t1 order by a; @@ -181,7 +181,7 @@ select * from t1 order by a; a b c 1 -1 -1 2 -2 -2 -update t1 set c=3 where b=-2; +update ignore t1 set c=3 where b=-2; Warnings: Warning 1906 The value specified for generated column 'c' in table 't1' ignored select * from t1 order by a; |