diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-08-15 14:04:20 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-08-15 14:04:20 -0700 |
| commit | 960720b10dc463a73214786302f009356c2284ce (patch) | |
| tree | e9c7748d0625f14a4c3a2a1d328b2ff0cace1990 /mysql-test/suite/vcol | |
| parent | f1b4718ec894664df221704bb70fed80bdc14070 (diff) | |
| parent | 7ba78277b4d76649501e85f05be2780e00ffc9c3 (diff) | |
| download | mariadb-git-960720b10dc463a73214786302f009356c2284ce.tar.gz | |
Merge 5.2->5.3
Diffstat (limited to 'mysql-test/suite/vcol')
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_misc.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/t/vcol_misc.test | 11 |
2 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index 4929eabb2e9..4514928e592 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -197,6 +197,13 @@ SELECT COUNT(*) FROM t1; COUNT(*) 2 DROP TABLE t1; +# +# MDEV-4823 Server crashes in Item_func_not::fix_fields on +# creating a table with a virtual column using NOT +# +CREATE TABLE t1 ( f1 INT, v4 INT AS ( NOT f1 ) VIRTUAL ); +drop table t1; +# end of 5.2 tests create table t1 (a int, b int); insert into t1 values (3, 30), (4, 20), (1, 20); create table t2 (c int, d int, v int as (d+1), index idx(c)); @@ -309,3 +316,4 @@ 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; +# 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 3c51ee4b685..9c8443218fa 100644 --- a/mysql-test/suite/vcol/t/vcol_misc.test +++ b/mysql-test/suite/vcol/t/vcol_misc.test @@ -197,6 +197,15 @@ SELECT COUNT(*) FROM t1; DROP TABLE t1; +--echo # +--echo # MDEV-4823 Server crashes in Item_func_not::fix_fields on +--echo # creating a table with a virtual column using NOT +--echo # +CREATE TABLE t1 ( f1 INT, v4 INT AS ( NOT f1 ) VIRTUAL ); +drop table t1; + +--echo # end of 5.2 tests + # # SELECT that uses a virtual column and executed with BKA # @@ -265,3 +274,5 @@ UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a --error ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); drop table t1; + +--echo # end of 5.3 tests |