summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2017-11-01 21:42:26 -0700
committerIgor Babaev <igor@askmonty.org>2017-11-01 21:42:26 -0700
commit6f1b6061d8e7aa867970c6827e6737c35ee8a254 (patch)
tree412e4263ad9a6f3d06736f59187fd8759c266f88 /mysql-test/r/ps.result
parent613dd62a76b51df38b96e36bce5bd8b7be2ca73a (diff)
parent34737e0cee5cd101a23c19d1f30b872a45393382 (diff)
downloadmariadb-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/r/ps.result')
-rw-r--r--mysql-test/r/ps.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 4cb5bb79982..ba52176e3bd 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -4792,7 +4792,7 @@ EXECUTE IMMEDIATE MAX('SELECT 1 AS c');
ERROR HY000: Invalid use of group function
EXECUTE IMMEDIATE DEFAULT(a);
ERROR 42S22: Unknown column 'a' in 'field list'
-EXECUTE IMMEDIATE VALUES(a);
+EXECUTE IMMEDIATE VALUE(a);
ERROR 42S22: Unknown column 'a' in 'field list'
CREATE FUNCTION f1() RETURNS VARCHAR(64) RETURN 't1';
EXECUTE IMMEDIATE f1();