Post-merge fixes.
This commit is contained in:
parent
36752387c1
commit
d7edf9785b
@ -27,7 +27,7 @@ call foo();
|
|||||||
PROCEDURE foo does not exist
|
PROCEDURE foo does not exist
|
||||||
drop procedure if exists foo;
|
drop procedure if exists foo;
|
||||||
Warnings:
|
Warnings:
|
||||||
Warning 1257 PROCEDURE foo does not exist
|
Warning 1261 PROCEDURE foo does not exist
|
||||||
create procedure foo()
|
create procedure foo()
|
||||||
foo: loop
|
foo: loop
|
||||||
leave bar;
|
leave bar;
|
||||||
|
@ -286,7 +286,7 @@ set sql_log_bin=1;
|
|||||||
set sql_log_off=1;
|
set sql_log_off=1;
|
||||||
set sql_log_update=1;
|
set sql_log_update=1;
|
||||||
Warnings:
|
Warnings:
|
||||||
Note 1267 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
|
Note 1271 The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored.
|
||||||
set sql_low_priority_updates=1;
|
set sql_low_priority_updates=1;
|
||||||
set sql_max_join_size=200;
|
set sql_max_join_size=200;
|
||||||
select @@sql_max_join_size,@@max_join_size;
|
select @@sql_max_join_size,@@max_join_size;
|
||||||
|
@ -22,48 +22,48 @@ create function func1() returns int
|
|||||||
return 42|
|
return 42|
|
||||||
|
|
||||||
# Can't create recursively
|
# Can't create recursively
|
||||||
--error 1255
|
--error 1259
|
||||||
create procedure foo()
|
create procedure foo()
|
||||||
create procedure bar() set @x=3|
|
create procedure bar() set @x=3|
|
||||||
--error 1255
|
--error 1259
|
||||||
create procedure foo()
|
create procedure foo()
|
||||||
create function bar() returns double return 2.3|
|
create function bar() returns double return 2.3|
|
||||||
|
|
||||||
# Already exists
|
# Already exists
|
||||||
--error 1256
|
--error 1260
|
||||||
create procedure proc1()
|
create procedure proc1()
|
||||||
set @x = 42|
|
set @x = 42|
|
||||||
--error 1256
|
--error 1260
|
||||||
create function func1() returns int
|
create function func1() returns int
|
||||||
return 42|
|
return 42|
|
||||||
|
|
||||||
# Does not exist
|
# Does not exist
|
||||||
--error 1257
|
--error 1261
|
||||||
alter procedure foo|
|
alter procedure foo|
|
||||||
--error 1257
|
--error 1261
|
||||||
alter function foo|
|
alter function foo|
|
||||||
--error 1257
|
--error 1261
|
||||||
drop procedure foo|
|
drop procedure foo|
|
||||||
--error 1257
|
--error 1261
|
||||||
drop function foo|
|
drop function foo|
|
||||||
--error 1257
|
--error 1261
|
||||||
call foo()|
|
call foo()|
|
||||||
drop procedure if exists foo|
|
drop procedure if exists foo|
|
||||||
|
|
||||||
# LEAVE/ITERATE with no match
|
# LEAVE/ITERATE with no match
|
||||||
--error 1260
|
--error 1264
|
||||||
create procedure foo()
|
create procedure foo()
|
||||||
foo: loop
|
foo: loop
|
||||||
leave bar;
|
leave bar;
|
||||||
end loop|
|
end loop|
|
||||||
--error 1260
|
--error 1264
|
||||||
create procedure foo()
|
create procedure foo()
|
||||||
foo: loop
|
foo: loop
|
||||||
iterate bar;
|
iterate bar;
|
||||||
end loop|
|
end loop|
|
||||||
|
|
||||||
# Redefining label
|
# Redefining label
|
||||||
--error 1261
|
--error 1265
|
||||||
create procedure foo()
|
create procedure foo()
|
||||||
foo: loop
|
foo: loop
|
||||||
foo: loop
|
foo: loop
|
||||||
@ -72,14 +72,14 @@ foo: loop
|
|||||||
end loop foo|
|
end loop foo|
|
||||||
|
|
||||||
# End label mismatch
|
# End label mismatch
|
||||||
--error 1262
|
--error 1266
|
||||||
create procedure foo()
|
create procedure foo()
|
||||||
foo: loop
|
foo: loop
|
||||||
set @x=2;
|
set @x=2;
|
||||||
end loop bar|
|
end loop bar|
|
||||||
|
|
||||||
# Referring to undef variable
|
# Referring to undef variable
|
||||||
--error 1263
|
--error 1267
|
||||||
create procedure foo(out x int)
|
create procedure foo(out x int)
|
||||||
begin
|
begin
|
||||||
declare y int;
|
declare y int;
|
||||||
@ -87,17 +87,17 @@ begin
|
|||||||
end|
|
end|
|
||||||
|
|
||||||
# We require INTO in SELECTs (for now; this might change in the future)
|
# We require INTO in SELECTs (for now; this might change in the future)
|
||||||
--error 1264
|
--error 1268
|
||||||
create procedure foo(x int)
|
create procedure foo(x int)
|
||||||
select * from test.t1|
|
select * from test.t1|
|
||||||
|
|
||||||
# RETURN in FUNCTION only
|
# RETURN in FUNCTION only
|
||||||
--error 1265
|
--error 1269
|
||||||
create procedure foo()
|
create procedure foo()
|
||||||
return 42|
|
return 42|
|
||||||
|
|
||||||
# Doesn't allow queries in FUNCTIONs (for now :-( )
|
# Doesn't allow queries in FUNCTIONs (for now :-( )
|
||||||
--error 1266
|
--error 1270
|
||||||
create function foo() returns int
|
create function foo() returns int
|
||||||
begin
|
begin
|
||||||
declare x int;
|
declare x int;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user