diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-06-10 14:04:21 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-06-10 14:04:21 +0400 |
| commit | ae51b5b6983fd4740e78d1a4bb3a361f7594b5f0 (patch) | |
| tree | 3d8862f2d6b04616f7d6ab9569c07e2072739ce6 | |
| parent | 41d860ef53e4461fa665da063fa34efb947ec4cd (diff) | |
| parent | a7229e8c20a0060a7adb599c6d52f3f68fbe4f35 (diff) | |
| download | mariadb-git-ae51b5b6983fd4740e78d1a4bb3a361f7594b5f0.tar.gz | |
Merge
| -rw-r--r-- | mysql-test/r/connect.result | 24 | ||||
| -rw-r--r-- | mysql-test/t/connect.test | 30 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
3 files changed, 55 insertions, 0 deletions
diff --git a/mysql-test/r/connect.result b/mysql-test/r/connect.result index 7a972f4814a..e8a09d45877 100644 --- a/mysql-test/r/connect.result +++ b/mysql-test/r/connect.result @@ -254,3 +254,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; diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test index e5c6e8371bf..cfe4e80fcbd 100644 --- a/mysql-test/t/connect.test +++ b/mysql-test/t/connect.test @@ -397,3 +397,33 @@ DROP USER mysqltest_up2@'%'; # Wait till all disconnects are completed --source include/wait_until_count_sessions.inc + +--echo # +--echo # BUG#1010351: New "via" keyword in 5.2+ can't be used as identifier anymore +--echo # +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; + +--disable_warnings +drop procedure if exists p1; +--enable_warnings + +delimiter |; +create procedure p1(x int) +foo: loop + if x = 0 then + leave foo; + end if; + select 'test'; + set x = x-1; +end loop foo| + +delimiter ;| +call p1(2); +drop procedure p1; + diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 49fe3e5079e..16269f13afe 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -12206,6 +12206,7 @@ keyword_sp: | WORK_SYM {} | X509_SYM {} | YEAR_SYM {} + | VIA_SYM {} ; /* Option functions */ |