summaryrefslogtreecommitdiff
path: root/mysql-test/r/sp.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/sp.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/sp.result')
-rw-r--r--mysql-test/r/sp.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result
index e46f9b840ed..b66faec260f 100644
--- a/mysql-test/r/sp.result
+++ b/mysql-test/r/sp.result
@@ -4440,7 +4440,7 @@ create table t3 (id int not null primary key, county varchar(25))|
insert into t3 (id, county) values (1, 'York')|
create procedure bug15441(c varchar(25))
begin
-update t3 set id=2, county=values(c);
+update t3 set id=2, county=value(c);
end|
call bug15441('county')|
ERROR 42S22: Unknown column 'c' in 'field list'
@@ -4451,7 +4451,7 @@ declare c varchar(25) default "hello";
insert into t3 (id, county) values (1, county)
on duplicate key update county= values(county);
select * from t3;
-update t3 set id=2, county=values(id);
+update t3 set id=2, county=value(id);
select * from t3;
end|
call bug15441('Yale')|