diff options
| author | Igor Babaev <igor@askmonty.org> | 2014-02-10 17:00:51 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2014-02-10 17:00:51 -0800 |
| commit | f17079fa7eff75ed831ebe09b22046b7d4b017e3 (patch) | |
| tree | d2573cd6ebd7b61e1540c35db78744d07ecf73f2 /mysql-test/suite/vcol | |
| parent | 41fd4844e8492880f9139cd9f10992a3dac390df (diff) | |
| parent | 3845a89b01ee0fa83812f5e3ac6b39b25da03d3d (diff) | |
| download | mariadb-git-f17079fa7eff75ed831ebe09b22046b7d4b017e3.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'mysql-test/suite/vcol')
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_misc.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/t/vcol_misc.test | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index 4514928e592..8631789f15f 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -316,4 +316,9 @@ ERROR HY000: The value specified for computed column 'd' in table 't1' ignored INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); ERROR HY000: The value specified for computed column 'd' in table 't1' ignored drop table t1; +# +# MDEV-5611: self-referencing virtual column +# +create table t1 (a int, b int as (b is null) virtual); +ERROR HY000: A computed column cannot be based on a computed column # end of 5.3 tests diff --git a/mysql-test/suite/vcol/t/vcol_misc.test b/mysql-test/suite/vcol/t/vcol_misc.test index 9c8443218fa..a4c1fc06ce9 100644 --- a/mysql-test/suite/vcol/t/vcol_misc.test +++ b/mysql-test/suite/vcol/t/vcol_misc.test @@ -275,4 +275,11 @@ UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); drop table t1; +--echo # +--echo # MDEV-5611: self-referencing virtual column +--echo # + +--error ER_VCOL_BASED_ON_VCOL +create table t1 (a int, b int as (b is null) virtual); + --echo # end of 5.3 tests |