diff options
| author | Igor Babaev <igor@askmonty.org> | 2017-11-01 21:42:26 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2017-11-01 21:42:26 -0700 |
| commit | 6f1b6061d8e7aa867970c6827e6737c35ee8a254 (patch) | |
| tree | 412e4263ad9a6f3d06736f59187fd8759c266f88 /mysql-test/t/default.test | |
| parent | 613dd62a76b51df38b96e36bce5bd8b7be2ca73a (diff) | |
| parent | 34737e0cee5cd101a23c19d1f30b872a45393382 (diff) | |
| download | mariadb-git-6f1b6061d8e7aa867970c6827e6737c35ee8a254.tar.gz | |
Merge remote-tracking branch 'shagalla/10.3-mdev12172' into 10.3
As a result of this merge the code for the following tasks appears in 10.3:
- MDEV-12172 Implement tables specified by table value constructors
- MDEV-12176 Transform [NOT] IN predicate with long list of values INTO
[NOT] IN subquery.
Diffstat (limited to 'mysql-test/t/default.test')
| -rw-r--r-- | mysql-test/t/default.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/default.test b/mysql-test/t/default.test index 7ee3b590a83..44778bc568a 100644 --- a/mysql-test/t/default.test +++ b/mysql-test/t/default.test @@ -180,7 +180,7 @@ CREATE TABLE t1 (a INT DEFAULT 10); INSERT INTO t1 VALUES (11); CREATE VIEW v1 AS SELECT a AS a FROM t1; CREATE VIEW v2 AS SELECT DEFAULT(a) AS a FROM t1; -CREATE VIEW v3 AS SELECT VALUES(a) AS a FROM t1; +CREATE VIEW v3 AS SELECT VALUE(a) AS a FROM t1; SELECT * FROM v1; SELECT * FROM v2; SELECT * FROM v3; @@ -447,7 +447,7 @@ CALL p1; DROP PROCEDURE p1; --error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED -CREATE TABLE t1 (a INT DEFAULT VALUES(a)); +CREATE TABLE t1 (a INT DEFAULT VALUE(a)); CREATE TABLE t1 (a INT); |