diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 13:09:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-27 13:27:04 +0200 |
| commit | 349560d5d5e53966fe75eef2bfefd12e29278f6a (patch) | |
| tree | ca1f26f2a2db1c8e2c86b8cbaae00abcebe5f6cf /mysql-test/suite/vcol/r/vcol_misc.result | |
| parent | 2d592f757cd624fe964ac39d05b6bdd985a827e2 (diff) | |
| parent | 1e9c2b2305c10ccaad235f3249a0f5084bf9b2c8 (diff) | |
| download | mariadb-git-349560d5d5e53966fe75eef2bfefd12e29278f6a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/vcol/r/vcol_misc.result')
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_misc.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index 958ccd7ad33..c03862d8670 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -108,10 +108,10 @@ DROP TABLE t1,t2; CREATE TABLE t1 (p int, a double NOT NULL, v double AS (ROUND(a,p)) VIRTUAL); INSERT IGNORE INTO t1 VALUES (0,1,0); Warnings: -Warning 1906 The value specified for generated column 'v' in table 't1' ignored +Warning 1906 The value specified for generated column 'v' in table 't1' has been ignored INSERT IGNORE INTO t1 VALUES (NULL,0,0); Warnings: -Warning 1906 The value specified for generated column 'v' in table 't1' ignored +Warning 1906 The value specified for generated column 'v' in table 't1' has been ignored SELECT a, p, v, ROUND(a,p), ROUND(a,p+NULL) FROM t1; a p v ROUND(a,p) ROUND(a,p+NULL) 1 0 1 1 NULL @@ -302,15 +302,15 @@ d varchar(5) latin1_swedish_ci YES NULL STORED GENERATED # INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,NULL); UPDATE IGNORE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a'; Warnings: -Warning 1906 The value specified for generated column 'd' in table 't1' ignored +Warning 1906 The value specified for generated column 'd' in table 't1' has been ignored INSERT IGNORE INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); Warnings: -Warning 1906 The value specified for generated column 'd' in table 't1' ignored +Warning 1906 The value specified for generated column 'd' in table 't1' has been ignored set sql_mode='strict_all_tables'; UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a'; -ERROR HY000: The value specified for generated column 'd' in table 't1' ignored +ERROR HY000: The value specified for generated column 'd' in table 't1' has been ignored INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); -ERROR HY000: The value specified for generated column 'd' in table 't1' ignored +ERROR HY000: The value specified for generated column 'd' in table 't1' has been ignored drop table t1; # # MDEV-5611: self-referencing virtual column |