diff options
author | Sergey Petrunya <psergey@askmonty.org> | 2012-06-10 14:12:50 +0400 |
---|---|---|
committer | Sergey Petrunya <psergey@askmonty.org> | 2012-06-10 14:12:50 +0400 |
commit | 9892ace475752e0ddd333500bec91e13ca54d0f3 (patch) | |
tree | 65e2825991e3a63d5245ce93699712826bb311d0 /mysql-test/r/connect.result | |
parent | d48f2e889db5b7a8199949170cc7d9035d3683a1 (diff) | |
parent | b038ad856e3c8d46751b86ea295cbd5d78d01e79 (diff) | |
download | mariadb-git-9892ace475752e0ddd333500bec91e13ca54d0f3.tar.gz |
Merge BUG#1010351 from 5.2 to 5.5
Diffstat (limited to 'mysql-test/r/connect.result')
-rw-r--r-- | mysql-test/r/connect.result | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result index a43a4d383ac..09eaf9855b0 100644 --- a/mysql-test/r/connect.result +++ b/mysql-test/r/connect.result @@ -257,3 +257,27 @@ connect(localhost,mysqltest_nouser,,test,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'mysqltest_nouser'@'localhost' (using password: NO) DROP USER mysqltest_up1@'%'; DROP USER mysqltest_up2@'%'; +# +# BUG#1010351: New "via" keyword in 5.2+ can't be used as identifier anymore +# +create table t1 (via int); +alter table t1 add key(via); +drop table t1; +create table t1 (col1 int); +alter table t1 add via int not null; +drop table t1; +drop procedure if exists p1; +create procedure p1(x int) +foo: loop +if x = 0 then +leave foo; +end if; +select 'test'; +set x = x-1; +end loop foo| +call p1(2); +test +test +test +test +drop procedure p1; |