Merge BUG#1010351 from 5.2 to 5.5
This commit is contained in:
commit
9892ace475
@ -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)
|
ERROR 28000: Access denied for user 'mysqltest_nouser'@'localhost' (using password: NO)
|
||||||
DROP USER mysqltest_up1@'%';
|
DROP USER mysqltest_up1@'%';
|
||||||
DROP USER mysqltest_up2@'%';
|
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;
|
||||||
|
@ -397,3 +397,33 @@ DROP USER mysqltest_up2@'%';
|
|||||||
# Wait till all disconnects are completed
|
# Wait till all disconnects are completed
|
||||||
--source include/wait_until_count_sessions.inc
|
--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;
|
||||||
|
|
||||||
|
@ -13252,6 +13252,7 @@ keyword_sp:
|
|||||||
| X509_SYM {}
|
| X509_SYM {}
|
||||||
| XML_SYM {}
|
| XML_SYM {}
|
||||||
| YEAR_SYM {}
|
| YEAR_SYM {}
|
||||||
|
| VIA_SYM {}
|
||||||
;
|
;
|
||||||
|
|
||||||
/* Option functions */
|
/* Option functions */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user