2003-01-17 14:38:05 +01:00
|
|
|
#
|
|
|
|
# Basic stored PROCEDURE tests
|
|
|
|
#
|
|
|
|
#
|
|
|
|
|
2004-08-13 18:02:52 +02:00
|
|
|
# Let us reset binary logs in order to make show master status
|
|
|
|
# in test for bug 4902 repeatable.
|
|
|
|
reset master;
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
use test;
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t1;
|
2003-03-02 19:17:41 +01:00
|
|
|
drop table if exists t2;
|
2003-01-17 14:38:05 +01:00
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
create table t1 (
|
|
|
|
id char(16) not null,
|
|
|
|
data int not null
|
|
|
|
);
|
2003-03-02 19:17:41 +01:00
|
|
|
create table t2 (
|
2003-11-20 18:30:02 +01:00
|
|
|
s char(16),
|
|
|
|
i int,
|
|
|
|
d double
|
2003-03-02 19:17:41 +01:00
|
|
|
);
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# Single statement, no params.
|
|
|
|
create procedure foo42()
|
|
|
|
insert into test.t1 values ("foo", 42);
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call foo42();
|
|
|
|
select * from t1;
|
|
|
|
delete from t1;
|
|
|
|
drop procedure foo42;
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# Single statement, two IN params.
|
|
|
|
create procedure bar(x char(16), y int)
|
|
|
|
insert into test.t1 values (x, y);
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call bar("bar", 666);
|
|
|
|
select * from t1;
|
|
|
|
delete from t1;
|
|
|
|
# Don't drop procedure yet...
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
# Now for multiple statements...
|
2003-01-17 14:38:05 +01:00
|
|
|
delimiter |;
|
|
|
|
|
Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
- ITERATE in labelled BEGIN-END (not allowed).
- Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
- Empty BEGIN-END (now allowed).
- End label (now optional).
include/mysqld_error.h:
New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/r/sp.result:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
mysql-test/t/sp-error.test:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/t/sp.test:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
sql/lex.h:
New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
sql/sp_pcontext.h:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
End-labels in SPs loop and begin-end blocks are now optional.
SQLSTATE [VALUE] added to syntax for sqlstates.
Check for duplicate variable, condition and cursor declarations, but
only in the same scope.
Empty BEGIN-END statements now allowed.
Check if ITERATE is referring to a BEGIN label.
2003-11-13 19:34:56 +01:00
|
|
|
# Empty statement
|
|
|
|
create procedure empty()
|
|
|
|
begin
|
|
|
|
end|
|
|
|
|
|
|
|
|
call empty()|
|
|
|
|
drop procedure empty|
|
|
|
|
|
|
|
|
# Scope test. This is legal (warnings might be possible in the future,
|
|
|
|
# but for the time being, we just accept it).
|
|
|
|
create procedure scope(a int, b float)
|
|
|
|
begin
|
|
|
|
declare b int;
|
|
|
|
declare c float;
|
|
|
|
|
|
|
|
begin
|
|
|
|
declare c int;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
|
|
|
|
drop procedure scope|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# Two statements.
|
|
|
|
create procedure two(x1 char(16), x2 char(16), y int)
|
|
|
|
begin
|
|
|
|
insert into test.t1 values (x1, y);
|
|
|
|
insert into test.t1 values (x2, y);
|
|
|
|
end|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call two("one", "two", 3)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure two|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# Simple test of local variables and SET.
|
|
|
|
create procedure locset(x char(16), y int)
|
|
|
|
begin
|
|
|
|
declare z1, z2 int;
|
|
|
|
set z1 = y;
|
|
|
|
set z2 = z1+2;
|
|
|
|
insert into test.t1 values (x, z2);
|
|
|
|
end|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call locset("locset", 19)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure locset|
|
|
|
|
|
|
|
|
|
2004-01-14 12:47:03 +01:00
|
|
|
# In some contexts local variables are not recognized
|
|
|
|
# (and in some, you have to qualify the identifier).
|
|
|
|
create procedure setcontext()
|
|
|
|
begin
|
|
|
|
declare data int default 2;
|
|
|
|
|
|
|
|
insert into t1 (id, data) values ("foo", 1);
|
|
|
|
replace t1 set data = data, id = "bar";
|
|
|
|
update t1 set id = "kaka", data = 3 where t1.data = data;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call setcontext()|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure setcontext|
|
|
|
|
|
|
|
|
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
# Set things to null
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
create table t3 ( d date, i int, f double, s varchar(32) )|
|
|
|
|
|
|
|
|
create procedure nullset()
|
|
|
|
begin
|
|
|
|
declare ld date;
|
|
|
|
declare li int;
|
|
|
|
declare lf double;
|
|
|
|
declare ls varchar(32);
|
|
|
|
|
|
|
|
set ld = null, li = null, lf = null, ls = null;
|
|
|
|
insert into t3 values (ld, li, lf, ls);
|
2003-11-20 16:14:24 +01:00
|
|
|
|
|
|
|
insert into t3 (i, f, s) values ((ld is null), 1, "ld is null"),
|
|
|
|
((li is null), 1, "li is null"),
|
|
|
|
((li = 0), null, "li = 0"),
|
|
|
|
((lf is null), 1, "lf is null"),
|
|
|
|
((lf = 0), null, "lf = 0"),
|
|
|
|
((ls is null), 1, "ls is null");
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
end|
|
|
|
|
|
|
|
|
call nullset()|
|
|
|
|
select * from t3|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure nullset|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# The peculiar (non-standard) mixture of variables types in SET.
|
|
|
|
create procedure mixset(x char(16), y int)
|
|
|
|
begin
|
|
|
|
declare z int;
|
|
|
|
|
|
|
|
set @z = y, z = 666, max_join_size = 100;
|
|
|
|
insert into test.t1 values (x, z);
|
|
|
|
end|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call mixset("mixset", 19)|
|
|
|
|
show variables like 'max_join_size'|
|
|
|
|
select id,data,@z from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure mixset|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# Multiple CALL statements, one with OUT parameter.
|
|
|
|
create procedure zip(x char(16), y int)
|
|
|
|
begin
|
|
|
|
declare z int;
|
|
|
|
call zap(y, z);
|
|
|
|
call bar(x, z);
|
|
|
|
end|
|
|
|
|
|
|
|
|
# SET local variables and OUT parameter.
|
|
|
|
create procedure zap(x int, out y int)
|
|
|
|
begin
|
|
|
|
declare z int;
|
|
|
|
set z = x+1, y = z;
|
|
|
|
end|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call zip("zip", 99)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure zip|
|
|
|
|
drop procedure bar|
|
|
|
|
|
2003-10-16 15:45:27 +02:00
|
|
|
# Top-level OUT parameter
|
|
|
|
call zap(7, @zap)|
|
|
|
|
select @zap|
|
|
|
|
|
|
|
|
drop procedure zap|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-05-23 15:32:31 +02:00
|
|
|
# "Deep" calls...
|
|
|
|
create procedure c1(x int)
|
|
|
|
call c2("c", x)|
|
|
|
|
create procedure c2(s char(16), x int)
|
|
|
|
call c3(x, s)|
|
|
|
|
create procedure c3(x int, s char(16))
|
|
|
|
call c4("level", x, s)|
|
|
|
|
create procedure c4(l char(8), x int, s char(16))
|
|
|
|
insert into t1 values (concat(l,s), x)|
|
|
|
|
|
|
|
|
call c1(42)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure c1|
|
|
|
|
drop procedure c2|
|
|
|
|
drop procedure c3|
|
|
|
|
drop procedure c4|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# INOUT test
|
|
|
|
create procedure iotest(x1 char(16), x2 char(16), y int)
|
|
|
|
begin
|
|
|
|
call inc2(x2, y);
|
|
|
|
insert into test.t1 values (x1, y);
|
|
|
|
end|
|
|
|
|
|
|
|
|
create procedure inc2(x char(16), y int)
|
|
|
|
begin
|
|
|
|
call inc(y);
|
|
|
|
insert into test.t1 values (x, y);
|
|
|
|
end|
|
|
|
|
|
|
|
|
create procedure inc(inout io int)
|
|
|
|
set io = io + 1|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call iotest("io1", "io2", 1)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure iotest|
|
|
|
|
drop procedure inc2|
|
|
|
|
|
2003-10-16 15:45:27 +02:00
|
|
|
# Propagating top-level @-vars
|
|
|
|
create procedure incr(inout x int)
|
|
|
|
call inc(x)|
|
|
|
|
|
|
|
|
# Before
|
|
|
|
select @zap|
|
|
|
|
call incr(@zap)|
|
|
|
|
# After
|
|
|
|
select @zap|
|
|
|
|
|
|
|
|
drop procedure inc|
|
|
|
|
drop procedure incr|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
|
|
# Call-by-value test
|
|
|
|
# The expected result is:
|
|
|
|
# ("cbv2", 4)
|
|
|
|
# ("cbv1", 4711)
|
|
|
|
create procedure cbv1()
|
|
|
|
begin
|
2003-03-30 13:25:43 +02:00
|
|
|
declare y int default 3;
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
|
|
call cbv2(y+1, y);
|
|
|
|
insert into test.t1 values ("cbv1", y);
|
|
|
|
end|
|
|
|
|
|
|
|
|
create procedure cbv2(y1 int, inout y2 int)
|
|
|
|
begin
|
|
|
|
set y2 = 4711;
|
|
|
|
insert into test.t1 values ("cbv2", y1);
|
|
|
|
end|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call cbv1()|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure cbv1|
|
|
|
|
drop procedure cbv2|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-04-27 17:35:54 +02:00
|
|
|
# Subselect arguments
|
|
|
|
|
|
|
|
insert into t2 values ("a", 1, 1.1), ("b", 2, 1.2), ("c", 3, 1.3)|
|
|
|
|
|
|
|
|
create procedure sub1(id char(16), x int)
|
|
|
|
insert into test.t1 values (id, x)|
|
|
|
|
|
|
|
|
# QQ This doesn't work yet
|
|
|
|
#create procedure sub2(id char(16))
|
|
|
|
#begin
|
|
|
|
# declare x int;
|
|
|
|
# set x = (select sum(t.x) from test.t2 t);
|
|
|
|
# insert into test.t1 values (id, x);
|
|
|
|
#end|
|
|
|
|
|
|
|
|
create function sub3(i int) returns int
|
|
|
|
return i+1|
|
|
|
|
|
|
|
|
call sub1("sub1a", (select 7))|
|
|
|
|
call sub1("sub1b", (select max(i) from t2))|
|
|
|
|
call sub1("sub1c", (select i,d from t2 limit 1))|
|
|
|
|
call sub1("sub1d", (select 1 from (select 1) a))|
|
|
|
|
#call sub2("sub2");
|
|
|
|
select * from t1|
|
|
|
|
select sub3((select max(i) from t2))|
|
|
|
|
drop procedure sub1|
|
|
|
|
#drop procedure sub2|
|
|
|
|
drop function sub3|
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t2|
|
2003-04-27 17:35:54 +02:00
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
# Basic tests of the flow control constructs
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
|
|
# Just test on 'x'...
|
|
|
|
create procedure a0(x int)
|
|
|
|
while x do
|
|
|
|
set x = x-1;
|
|
|
|
insert into test.t1 values ("a0", x);
|
|
|
|
end while|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call a0(3)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure a0|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# The same, but with a more traditional test.
|
|
|
|
create procedure a(x int)
|
|
|
|
while x > 0 do
|
|
|
|
set x = x-1;
|
|
|
|
insert into test.t1 values ("a", x);
|
|
|
|
end while|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call a(3)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure a|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# REPEAT
|
|
|
|
create procedure b(x int)
|
2003-01-23 14:00:31 +01:00
|
|
|
repeat
|
|
|
|
insert into test.t1 values (repeat("b",3), x);
|
2003-01-17 14:38:05 +01:00
|
|
|
set x = x-1;
|
2003-01-23 14:00:31 +01:00
|
|
|
until x = 0 end repeat|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call b(3)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure b|
|
|
|
|
|
|
|
|
|
2003-01-23 14:00:32 +01:00
|
|
|
# Check that repeat isn't parsed the wrong way
|
|
|
|
create procedure b2(x int)
|
|
|
|
repeat(select 1 into outfile 'b2');
|
|
|
|
insert into test.t1 values (repeat("b2",3), x);
|
|
|
|
set x = x-1;
|
|
|
|
until x = 0 end repeat|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
2003-01-23 14:00:32 +01:00
|
|
|
# We don't actually want to call it.
|
|
|
|
drop procedure b2|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# Labelled WHILE with ITERATE (pointless really)
|
|
|
|
create procedure c(x int)
|
|
|
|
hmm: while x > 0 do
|
|
|
|
insert into test.t1 values ("c", x);
|
|
|
|
set x = x-1;
|
|
|
|
iterate hmm;
|
|
|
|
insert into test.t1 values ("x", x);
|
|
|
|
end while hmm|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call c(3)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure c|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# Labelled WHILE with LEAVE
|
|
|
|
create procedure d(x int)
|
|
|
|
hmm: while x > 0 do
|
|
|
|
insert into test.t1 values ("d", x);
|
|
|
|
set x = x-1;
|
|
|
|
leave hmm;
|
|
|
|
insert into test.t1 values ("x", x);
|
Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
- ITERATE in labelled BEGIN-END (not allowed).
- Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
- Empty BEGIN-END (now allowed).
- End label (now optional).
include/mysqld_error.h:
New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/r/sp.result:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
mysql-test/t/sp-error.test:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/t/sp.test:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
sql/lex.h:
New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
sql/sp_pcontext.h:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
End-labels in SPs loop and begin-end blocks are now optional.
SQLSTATE [VALUE] added to syntax for sqlstates.
Check for duplicate variable, condition and cursor declarations, but
only in the same scope.
Empty BEGIN-END statements now allowed.
Check if ITERATE is referring to a BEGIN label.
2003-11-13 19:34:56 +01:00
|
|
|
end while|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call d(3)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure d|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# LOOP, with simple IF statement
|
|
|
|
create procedure e(x int)
|
|
|
|
foo: loop
|
|
|
|
if x = 0 then
|
|
|
|
leave foo;
|
|
|
|
end if;
|
|
|
|
insert into test.t1 values ("e", x);
|
|
|
|
set x = x-1;
|
|
|
|
end loop foo|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call e(3)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure e|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# A full IF statement
|
|
|
|
create procedure f(x int)
|
|
|
|
if x < 0 then
|
|
|
|
insert into test.t1 values ("f", 0);
|
|
|
|
elseif x = 0 then
|
|
|
|
insert into test.t1 values ("f", 1);
|
|
|
|
else
|
|
|
|
insert into test.t1 values ("f", 2);
|
|
|
|
end if|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call f(-2)|
|
|
|
|
call f(0)|
|
|
|
|
call f(4)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure f|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# This form of CASE is really just syntactic sugar for IF-ELSEIF-...
|
|
|
|
create procedure g(x int)
|
|
|
|
case
|
|
|
|
when x < 0 then
|
|
|
|
insert into test.t1 values ("g", 0);
|
|
|
|
when x = 0 then
|
|
|
|
insert into test.t1 values ("g", 1);
|
|
|
|
else
|
|
|
|
insert into test.t1 values ("g", 2);
|
|
|
|
end case|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call g(-42)|
|
|
|
|
call g(0)|
|
|
|
|
call g(1)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure g|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
# The "simple CASE"
|
|
|
|
create procedure h(x int)
|
|
|
|
case x
|
|
|
|
when 0 then
|
|
|
|
insert into test.t1 values ("h0", x);
|
|
|
|
when 1 then
|
|
|
|
insert into test.t1 values ("h1", x);
|
|
|
|
else
|
|
|
|
insert into test.t1 values ("h?", x);
|
|
|
|
end case|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call h(0)|
|
|
|
|
call h(1)|
|
|
|
|
call h(17)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure h|
|
|
|
|
|
|
|
|
|
Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
- ITERATE in labelled BEGIN-END (not allowed).
- Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
- Empty BEGIN-END (now allowed).
- End label (now optional).
include/mysqld_error.h:
New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/r/sp.result:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
mysql-test/t/sp-error.test:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/t/sp.test:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
sql/lex.h:
New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
sql/sp_pcontext.h:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
End-labels in SPs loop and begin-end blocks are now optional.
SQLSTATE [VALUE] added to syntax for sqlstates.
Check for duplicate variable, condition and cursor declarations, but
only in the same scope.
Empty BEGIN-END statements now allowed.
Check if ITERATE is referring to a BEGIN label.
2003-11-13 19:34:56 +01:00
|
|
|
# It's actually possible to LEAVE a BEGIN-END block
|
|
|
|
create procedure i(x int)
|
|
|
|
foo:
|
|
|
|
begin
|
|
|
|
if x = 0 then
|
|
|
|
leave foo;
|
|
|
|
end if;
|
|
|
|
insert into test.t1 values ("i", x);
|
|
|
|
end foo|
|
|
|
|
|
|
|
|
call i(0)|
|
|
|
|
call i(3)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure i|
|
|
|
|
|
|
|
|
|
2004-08-17 20:20:58 +02:00
|
|
|
# The non-standard GOTO, for compatibility
|
|
|
|
#
|
|
|
|
# QQQ The "label" syntax is temporary.
|
|
|
|
# QQQ This is no nearly enough, more tests are needed
|
|
|
|
#
|
|
|
|
create procedure j()
|
|
|
|
begin
|
|
|
|
declare y int;
|
|
|
|
|
|
|
|
label a;
|
|
|
|
select * from t1;
|
|
|
|
select count(*) into y from t1;
|
|
|
|
if y > 2 then
|
|
|
|
goto b;
|
|
|
|
end if;
|
|
|
|
insert into t1 values ("j", y);
|
|
|
|
goto a;
|
|
|
|
label b;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call j()|
|
|
|
|
|
|
|
|
drop procedure j|
|
|
|
|
|
|
|
|
# With dummy handlers, just to test restore of contexts with jumps
|
|
|
|
create procedure k(a int)
|
|
|
|
begin
|
|
|
|
declare x int default 0;
|
|
|
|
declare continue handler for sqlstate '42S98' set x = 1;
|
|
|
|
|
|
|
|
label a;
|
|
|
|
select * from t1;
|
|
|
|
b:
|
|
|
|
while x < 2 do
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlstate '42S99' set x = 2;
|
|
|
|
|
|
|
|
if a = 0 then
|
|
|
|
set x = x + 1;
|
|
|
|
iterate b;
|
|
|
|
elseif a = 1 then
|
|
|
|
leave b;
|
|
|
|
elseif a = 2 then
|
|
|
|
set a = 1;
|
|
|
|
goto a;
|
|
|
|
end if;
|
|
|
|
end;
|
|
|
|
end while b;
|
|
|
|
|
|
|
|
select * from t1;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call k(0)|
|
|
|
|
call k(1)|
|
|
|
|
call k(2)|
|
|
|
|
|
|
|
|
drop procedure k|
|
|
|
|
delete from t1|
|
|
|
|
|
2003-12-16 18:09:22 +01:00
|
|
|
# SELECT with one of more result set sent back to the clinet
|
|
|
|
insert into t1 values ("foo", 3), ("bar", 19)|
|
|
|
|
insert into t2 values ("x", 9, 4.1), ("y", -1, 19.2), ("z", 3, 2.2)|
|
|
|
|
|
|
|
|
create procedure sel1()
|
|
|
|
begin
|
|
|
|
select * from t1;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call sel1()|
|
|
|
|
drop procedure sel1|
|
|
|
|
|
|
|
|
create procedure sel2()
|
|
|
|
begin
|
|
|
|
select * from t1;
|
|
|
|
select * from t2;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call sel2()|
|
|
|
|
drop procedure sel2|
|
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
# SELECT INTO local variables
|
2003-02-02 17:41:21 +01:00
|
|
|
create procedure into_test(x char(16), y int)
|
|
|
|
begin
|
|
|
|
insert into test.t1 values (x, y);
|
|
|
|
select id,data into x,y from test.t1 limit 1;
|
|
|
|
insert into test.t1 values (concat(x, "2"), y+2);
|
|
|
|
end|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call into_test("into", 100)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure into_test|
|
|
|
|
|
|
|
|
|
|
|
|
# SELECT INTO with a mix of local and global variables
|
2003-02-02 17:41:21 +01:00
|
|
|
create procedure into_test2(x char(16), y int)
|
2003-01-18 17:21:13 +01:00
|
|
|
begin
|
|
|
|
insert into test.t1 values (x, y);
|
2003-02-02 17:41:21 +01:00
|
|
|
select id,data into x,@z from test.t1 limit 1;
|
|
|
|
insert into test.t1 values (concat(x, "2"), y+2);
|
2003-01-18 17:21:13 +01:00
|
|
|
end|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
call into_test2("into", 100)|
|
|
|
|
select id,data,@z from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure into_test2|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
|
|
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
# SELECT * INTO ... (bug test)
|
|
|
|
create procedure into_test3()
|
|
|
|
begin
|
|
|
|
declare x char(16);
|
|
|
|
declare y int;
|
|
|
|
|
|
|
|
select * into x,y from test.t1 limit 1;
|
|
|
|
insert into test.t2 values (x, y, 0.0);
|
|
|
|
end|
|
|
|
|
|
|
|
|
insert into t1 values ("into3", 19)|
|
|
|
|
# Two call needed for bug test
|
|
|
|
call into_test3()|
|
|
|
|
call into_test3()|
|
|
|
|
select * from t2|
|
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
|
|
|
drop procedure into_test3|
|
|
|
|
|
|
|
|
|
|
|
|
# SELECT INTO with no data is a warning ("no data", which we will
|
|
|
|
# not see normally). When not caught, execution proceeds.
|
|
|
|
create procedure into_test4()
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
|
|
|
|
select data into x from test.t1 limit 1;
|
|
|
|
insert into test.t3 values ("into4", x);
|
|
|
|
end|
|
|
|
|
|
|
|
|
delete from t1|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
create table t3 ( s char(16), d int)|
|
|
|
|
call into_test4()|
|
|
|
|
select * from t3|
|
|
|
|
insert into t1 values ("i4", 77)|
|
|
|
|
call into_test4()|
|
|
|
|
select * from t3|
|
|
|
|
delete from t1|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure into_test4|
|
|
|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
# These two (and the two procedures above) caused an assert() to fail in
|
|
|
|
# sql_base.cc:lock_tables() at some point.
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
create procedure into_outfile(x char(16), y int)
|
|
|
|
begin
|
|
|
|
insert into test.t1 values (x, y);
|
|
|
|
select * into outfile "/tmp/spout" from test.t1;
|
|
|
|
insert into test.t1 values (concat(x, "2"), y+2);
|
|
|
|
end|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
system rm -f /tmp/spout|
|
|
|
|
call into_outfile("ofile", 1)|
|
|
|
|
system rm -f /tmp/spout|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure into_outfile|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
create procedure into_dumpfile(x char(16), y int)
|
|
|
|
begin
|
|
|
|
insert into test.t1 values (x, y);
|
|
|
|
select * into dumpfile "/tmp/spdump" from test.t1 limit 1;
|
|
|
|
insert into test.t1 values (concat(x, "2"), y+2);
|
|
|
|
end|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
system rm -f /tmp/spdump|
|
|
|
|
call into_dumpfile("dfile", 1)|
|
|
|
|
system rm -f /tmp/spdump|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure into_dumpfile|
|
2003-02-02 17:41:21 +01:00
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
create procedure create_select(x char(16), y int)
|
|
|
|
begin
|
|
|
|
insert into test.t1 values (x, y);
|
2003-04-04 15:47:43 +02:00
|
|
|
create table test.t3 select * from test.t1;
|
|
|
|
insert into test.t3 values (concat(x, "2"), y+2);
|
2003-02-19 12:42:32 +01:00
|
|
|
end|
|
2003-02-02 17:41:21 +01:00
|
|
|
|
2003-04-04 15:47:43 +02:00
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
call create_select("cs", 90)|
|
|
|
|
select * from t1, t3|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
delete from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
drop procedure create_select|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
2003-04-04 15:47:43 +02:00
|
|
|
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
# A minimal, constant FUNCTION.
|
|
|
|
create function e() returns double
|
|
|
|
return 2.7182818284590452354|
|
|
|
|
|
2003-02-27 19:08:52 +01:00
|
|
|
set @e = e()|
|
|
|
|
select e(), @e|
|
2003-02-26 19:22:29 +01:00
|
|
|
|
|
|
|
# A minimal function with one argument
|
|
|
|
create function inc(i int) returns int
|
|
|
|
return i+1|
|
|
|
|
|
|
|
|
select inc(1), inc(99), inc(-71)|
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
|
2003-02-26 19:22:29 +01:00
|
|
|
# A minimal function with two arguments
|
|
|
|
create function mul(x int, y int) returns int
|
|
|
|
return x*y|
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
|
2003-02-26 19:22:29 +01:00
|
|
|
select mul(1,1), mul(3,5), mul(4711, 666)|
|
|
|
|
|
2003-02-27 19:08:52 +01:00
|
|
|
# A minimal string function
|
|
|
|
create function append(s1 char(8), s2 char(8)) returns char(16)
|
|
|
|
return concat(s1, s2)|
|
|
|
|
|
|
|
|
select append("foo", "bar")|
|
|
|
|
|
2003-02-26 19:22:29 +01:00
|
|
|
# A function with flow control
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
create function fac(n int unsigned) returns bigint unsigned
|
|
|
|
begin
|
2003-03-30 13:25:43 +02:00
|
|
|
declare f bigint unsigned default 1;
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
|
|
|
|
while n > 1 do
|
|
|
|
set f = f * n;
|
|
|
|
set n = n - 1;
|
|
|
|
end while;
|
|
|
|
return f;
|
|
|
|
end|
|
|
|
|
|
2003-02-27 19:08:52 +01:00
|
|
|
select fac(1), fac(2), fac(5), fac(10)|
|
2003-02-26 19:22:29 +01:00
|
|
|
|
2003-03-02 19:17:41 +01:00
|
|
|
# Nested calls
|
|
|
|
create function fun(d double, i int, u int unsigned) returns double
|
|
|
|
return mul(inc(i), fac(u)) / e()|
|
|
|
|
|
|
|
|
select fun(2.3, 3, 5)|
|
|
|
|
|
|
|
|
|
|
|
|
# Various function calls in differen statements
|
|
|
|
|
|
|
|
insert into t2 values (append("xxx", "yyy"), mul(4,3), e())|
|
|
|
|
insert into t2 values (append("a", "b"), mul(2,mul(3,4)), fun(1.7, 4, 6))|
|
|
|
|
|
|
|
|
# These don't work yet.
|
|
|
|
select * from t2 where s = append("a", "b")|
|
|
|
|
select * from t2 where i = mul(4,3) or i = mul(mul(3,4),2)|
|
|
|
|
select * from t2 where d = e()|
|
|
|
|
select * from t2|
|
|
|
|
delete from t2|
|
|
|
|
|
2003-02-26 19:22:29 +01:00
|
|
|
drop function e|
|
|
|
|
drop function inc|
|
|
|
|
drop function mul|
|
2003-02-27 19:08:52 +01:00
|
|
|
drop function append|
|
2003-03-02 19:17:41 +01:00
|
|
|
drop function fun|
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
|
2003-03-03 15:03:19 +01:00
|
|
|
|
2003-09-16 14:26:08 +02:00
|
|
|
#
|
|
|
|
# CONDITIONs and HANDLERs
|
|
|
|
#
|
|
|
|
|
|
|
|
create procedure hndlr1(val int)
|
|
|
|
begin
|
|
|
|
declare x int default 0;
|
|
|
|
declare foo condition for 1146;
|
Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
- ITERATE in labelled BEGIN-END (not allowed).
- Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
- Empty BEGIN-END (now allowed).
- End label (now optional).
include/mysqld_error.h:
New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/r/sp.result:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
mysql-test/t/sp-error.test:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/t/sp.test:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
sql/lex.h:
New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
sql/sp_pcontext.h:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
End-labels in SPs loop and begin-end blocks are now optional.
SQLSTATE [VALUE] added to syntax for sqlstates.
Check for duplicate variable, condition and cursor declarations, but
only in the same scope.
Empty BEGIN-END statements now allowed.
Check if ITERATE is referring to a BEGIN label.
2003-11-13 19:34:56 +01:00
|
|
|
declare bar condition for sqlstate '42S98'; # Just for testing syntax
|
|
|
|
declare zip condition for sqlstate value '42S99'; # Just for testing syntax
|
2003-09-16 14:26:08 +02:00
|
|
|
declare continue handler for foo set x = 1;
|
|
|
|
|
|
|
|
insert into test.t666 values ("hndlr1", val); # Non-existing table
|
|
|
|
if (x) then
|
|
|
|
insert into test.t1 values ("hndlr1", val); # This instead then
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call hndlr1(42)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure hndlr1|
|
|
|
|
|
|
|
|
create procedure hndlr2(val int)
|
|
|
|
begin
|
|
|
|
declare x int default 0;
|
|
|
|
|
|
|
|
begin
|
Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
- ITERATE in labelled BEGIN-END (not allowed).
- Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
- Empty BEGIN-END (now allowed).
- End label (now optional).
include/mysqld_error.h:
New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/r/sp.result:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
mysql-test/t/sp-error.test:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/t/sp.test:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
sql/lex.h:
New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
sql/sp_pcontext.h:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
End-labels in SPs loop and begin-end blocks are now optional.
SQLSTATE [VALUE] added to syntax for sqlstates.
Check for duplicate variable, condition and cursor declarations, but
only in the same scope.
Empty BEGIN-END statements now allowed.
Check if ITERATE is referring to a BEGIN label.
2003-11-13 19:34:56 +01:00
|
|
|
declare exit handler for sqlstate '42S02' set x = 1;
|
2003-09-16 14:26:08 +02:00
|
|
|
|
|
|
|
insert into test.t666 values ("hndlr2", val); # Non-existing table
|
|
|
|
end;
|
|
|
|
|
|
|
|
insert into test.t1 values ("hndlr2", x);
|
|
|
|
end|
|
|
|
|
|
|
|
|
call hndlr2(42)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure hndlr2|
|
|
|
|
|
|
|
|
|
|
|
|
create procedure hndlr3(val int)
|
|
|
|
begin
|
|
|
|
declare x int default 0;
|
|
|
|
declare continue handler for sqlexception # Any error
|
|
|
|
begin
|
|
|
|
declare z int;
|
|
|
|
|
|
|
|
set z = 2 * val;
|
|
|
|
set x = 1;
|
|
|
|
end;
|
|
|
|
|
|
|
|
if val < 10 then
|
|
|
|
begin
|
|
|
|
declare y int;
|
|
|
|
|
|
|
|
set y = val + 10;
|
|
|
|
insert into test.t666 values ("hndlr3", y); # Non-existing table
|
|
|
|
if x then
|
|
|
|
insert into test.t1 values ("hndlr3", y);
|
|
|
|
end if;
|
|
|
|
end;
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call hndlr3(3)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure hndlr3|
|
|
|
|
|
2003-10-17 17:13:49 +02:00
|
|
|
|
|
|
|
# Variables might be uninitialized when using handlers
|
|
|
|
# (Otherwise the compiler can detect if a variable is not set, but
|
|
|
|
# not in this case.)
|
2003-10-20 16:59:45 +02:00
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
create table t3 ( id char(16), data int )|
|
|
|
|
|
2003-10-17 17:13:49 +02:00
|
|
|
create procedure hndlr4()
|
|
|
|
begin
|
|
|
|
declare x int default 0;
|
|
|
|
declare val int; # No default
|
2003-12-01 18:24:09 +01:00
|
|
|
declare continue handler for sqlstate '02000' set x=1;
|
2003-10-17 17:13:49 +02:00
|
|
|
|
2003-10-20 16:59:45 +02:00
|
|
|
select data into val from test.t3 where id='z' limit 1; # No hits
|
2003-10-17 17:13:49 +02:00
|
|
|
|
2003-10-20 16:59:45 +02:00
|
|
|
insert into test.t3 values ('z', val);
|
2003-10-17 17:13:49 +02:00
|
|
|
end|
|
|
|
|
|
|
|
|
call hndlr4()|
|
2003-10-20 16:59:45 +02:00
|
|
|
select * from t3|
|
|
|
|
drop table t3|
|
2003-10-17 17:13:49 +02:00
|
|
|
drop procedure hndlr4|
|
|
|
|
|
|
|
|
|
2003-10-10 16:57:21 +02:00
|
|
|
#
|
|
|
|
# Cursors
|
|
|
|
#
|
|
|
|
create procedure cur1()
|
|
|
|
begin
|
|
|
|
declare a char(16);
|
|
|
|
declare b int;
|
|
|
|
declare c double;
|
2004-03-29 11:16:45 +02:00
|
|
|
declare done int default 0;
|
|
|
|
declare c cursor for select * from test.t2;
|
|
|
|
declare continue handler for sqlstate '02000' set done = 1;
|
2003-10-10 16:57:21 +02:00
|
|
|
|
|
|
|
open c;
|
|
|
|
repeat
|
|
|
|
fetch c into a, b, c;
|
|
|
|
if not done then
|
|
|
|
insert into test.t1 values (a, b+c);
|
|
|
|
end if;
|
|
|
|
until done end repeat;
|
|
|
|
close c;
|
|
|
|
end|
|
|
|
|
|
|
|
|
insert into t2 values ("foo", 42, -1.9), ("bar", 3, 12.1), ("zap", 666, -3.14)|
|
|
|
|
call cur1()|
|
|
|
|
select * from t1|
|
2003-10-14 12:59:28 +02:00
|
|
|
drop procedure cur1|
|
|
|
|
|
2003-10-20 16:59:45 +02:00
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
2003-10-14 12:59:28 +02:00
|
|
|
create table t3 ( s char(16), i int )|
|
|
|
|
|
|
|
|
create procedure cur2()
|
|
|
|
begin
|
|
|
|
declare done int default 0;
|
|
|
|
declare c1 cursor for select id,data from test.t1;
|
|
|
|
declare c2 cursor for select i from test.t2;
|
2004-03-29 11:16:45 +02:00
|
|
|
declare continue handler for sqlstate '02000' set done = 1;
|
2003-10-14 12:59:28 +02:00
|
|
|
|
|
|
|
open c1;
|
|
|
|
open c2;
|
|
|
|
repeat
|
|
|
|
begin
|
|
|
|
declare a char(16);
|
|
|
|
declare b,c int;
|
|
|
|
|
|
|
|
fetch c1 into a, b;
|
|
|
|
fetch c2 into c;
|
|
|
|
if not done then
|
|
|
|
if b < c then
|
|
|
|
insert into test.t3 values (a, b);
|
|
|
|
else
|
|
|
|
insert into test.t3 values (a, c);
|
|
|
|
end if;
|
|
|
|
end if;
|
|
|
|
end;
|
|
|
|
until done end repeat;
|
|
|
|
close c1;
|
|
|
|
close c2;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call cur2()|
|
|
|
|
select * from t3|
|
2003-10-10 16:57:21 +02:00
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
2003-10-14 12:59:28 +02:00
|
|
|
drop table t3|
|
|
|
|
drop procedure cur2|
|
2003-09-16 14:26:08 +02:00
|
|
|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
In order to make ALTER PROCEDURE|FUNCTION work correctly, and in general to
make characteristics (and SHOW) work right, we had to separate the old
definition blob in the mysql.proc table into separate fields for parameters,
return type, and body, and handle the characteristics (like SQL SECURITY)
separately... and then reassemble the CREATE string for parsing, of course.
This is rather ugly, mostly the parser bit. (Hopefully that will be better
with the new parser.)
Docs/sp-imp-spec.txt:
Separated the definitions string of the procedure into different columns
in the mysql.proc schema.
mysql-test/r/sp.result:
New characteristics tests.
mysql-test/t/sp.test:
New characteristics tests.
scripts/mysql_create_system_tables.sh:
Separated the definitions string of the procedure into different columns
in the mysql.proc schema.
scripts/mysql_fix_privilege_tables.sql:
Separated the definitions string of the procedure into different columns
in the mysql.proc schema.
sql/sp.cc:
Separated the definitions string of the procedure into different columns.
Rewrote much of the code related this (have a assemble the definition
string from its different parts now) and the way characteristics are now
handled, in order to make ALTER actually work.
sql/sp.h:
Changed prototypes.
sql/sp_head.cc:
Rewrote much of the code related to the new mysql.proc schema with separate
definition fields (have to assemble the definition string from its different
parts now) and the way characteristics are now handled, in order to make ALTER
actually work.
sql/sp_head.h:
Separated the different parts of the definition strings: name, parameters,
return type (for functions) and body.
sql/sql_yacc.yy:
Separated the different parts of the definition strings: name, parameters,
return type (for functions) and body.
This is ugly and messy; hopefully there's a more elegant way to do this
when the new parser is installed.
2003-12-12 14:05:29 +01:00
|
|
|
# The few characteristics we parse
|
|
|
|
create procedure chistics()
|
|
|
|
language sql
|
|
|
|
not deterministic
|
|
|
|
sql security definer
|
|
|
|
comment 'Characteristics procedure test'
|
|
|
|
insert into t1 values ("chistics", 1)|
|
|
|
|
|
|
|
|
# Call it, just to make sure.
|
|
|
|
call chistics()|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
alter procedure chistics sql security invoker name chistics2|
|
|
|
|
show create procedure chistics2|
|
|
|
|
drop procedure chistics2|
|
|
|
|
|
|
|
|
create function chistics() returns int
|
|
|
|
language sql
|
|
|
|
deterministic
|
|
|
|
sql security invoker
|
|
|
|
comment 'Characteristics procedure test'
|
|
|
|
return 42|
|
|
|
|
|
|
|
|
# Call it, just to make sure.
|
|
|
|
select chistics()|
|
|
|
|
alter function chistics name chistics2 comment 'Characteristics function test'|
|
|
|
|
show create function chistics2|
|
|
|
|
drop function chistics2|
|
|
|
|
|
|
|
|
|
2003-12-11 12:23:50 +01:00
|
|
|
# Check mode settings
|
|
|
|
insert into t1 values ("foo", 1), ("bar", 2), ("zip", 3)|
|
|
|
|
|
|
|
|
set @@sql_mode = 'ANSI'|
|
|
|
|
delimiter $|
|
|
|
|
create procedure modes(out c1 int, out c2 int)
|
|
|
|
begin
|
|
|
|
declare done int default 0;
|
|
|
|
declare x int;
|
|
|
|
declare c cursor for select data from t1;
|
2004-03-29 11:16:45 +02:00
|
|
|
declare continue handler for sqlstate '02000' set done = 1;
|
2003-12-11 12:23:50 +01:00
|
|
|
|
|
|
|
select 1 || 2 into c1;
|
|
|
|
set c2 = 0;
|
|
|
|
open c;
|
|
|
|
repeat
|
|
|
|
fetch c into x;
|
|
|
|
if not done then
|
|
|
|
set c2 = c2 + 1;
|
|
|
|
end if;
|
|
|
|
until done end repeat;
|
|
|
|
close c;
|
|
|
|
end$
|
|
|
|
delimiter |$
|
|
|
|
set @@sql_mode = ''|
|
|
|
|
|
|
|
|
set sql_select_limit = 1|
|
|
|
|
call modes(@c1, @c2)|
|
|
|
|
set sql_select_limit = default|
|
|
|
|
|
|
|
|
select @c1, @c2|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure modes|
|
|
|
|
|
|
|
|
|
2004-03-22 14:44:41 +01:00
|
|
|
# Check that dropping a database without routines works.
|
|
|
|
# (Dropping with routines is tested in sp-security.test)
|
|
|
|
# First an empty db.
|
|
|
|
create database sp_db1|
|
|
|
|
drop database sp_db1|
|
|
|
|
|
|
|
|
# Again, with a table.
|
|
|
|
create database sp_db2|
|
|
|
|
use sp_db2|
|
|
|
|
# Just put something in here...
|
|
|
|
create table t3 ( s char(4), t int )|
|
|
|
|
insert into t3 values ("abcd", 42), ("dcba", 666)|
|
|
|
|
use test|
|
|
|
|
drop database sp_db2|
|
|
|
|
|
|
|
|
# And yet again, with just a procedure.
|
|
|
|
create database sp_db3|
|
|
|
|
use sp_db3|
|
|
|
|
create procedure dummy(out x int)
|
|
|
|
set x = 42|
|
|
|
|
use test|
|
|
|
|
drop database sp_db3|
|
|
|
|
# Check that it's gone
|
|
|
|
select type,db,name from mysql.proc where db = 'sp_db3'|
|
|
|
|
|
|
|
|
|
2004-05-04 13:45:20 +02:00
|
|
|
# ROW_COUNT() function after a CALL
|
|
|
|
# We test the other cases here too, although it's not strictly SP specific
|
|
|
|
create procedure rc()
|
|
|
|
begin
|
|
|
|
delete from t1;
|
|
|
|
insert into t1 values ("a", 1), ("b", 2), ("c", 3);
|
|
|
|
end|
|
|
|
|
|
|
|
|
call rc()|
|
|
|
|
select row_count()|
|
|
|
|
update t1 set data=42 where id = "b";
|
|
|
|
select row_count()|
|
|
|
|
delete from t1|
|
|
|
|
select row_count()|
|
|
|
|
delete from t1|
|
|
|
|
select row_count()|
|
2004-05-04 17:18:47 +02:00
|
|
|
select * from t1|
|
|
|
|
select row_count()|
|
2004-05-04 13:45:20 +02:00
|
|
|
drop procedure rc|
|
|
|
|
|
|
|
|
|
2003-12-05 18:52:33 +01:00
|
|
|
#
|
|
|
|
# Test cases for old bugs
|
|
|
|
#
|
|
|
|
|
2003-10-10 16:57:21 +02:00
|
|
|
#
|
|
|
|
# BUG#822
|
|
|
|
#
|
2003-10-03 12:39:12 +02:00
|
|
|
create procedure bug822(a_id char(16), a_data int)
|
|
|
|
begin
|
|
|
|
declare n int;
|
|
|
|
select count(*) into n from t1 where id = a_id and data = a_data;
|
|
|
|
if n = 0 then
|
|
|
|
insert into t1 (id, data) values (a_id, a_data);
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug822('foo', 42)|
|
|
|
|
call bug822('foo', 42)|
|
|
|
|
call bug822('bar', 666)|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure bug822|
|
|
|
|
|
2003-10-14 12:59:28 +02:00
|
|
|
#
|
|
|
|
# BUG#1495
|
|
|
|
#
|
|
|
|
create procedure bug1495()
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
|
|
|
|
select data into x from t1 order by id limit 1;
|
|
|
|
if x > 10 then
|
|
|
|
insert into t1 values ("less", x-10);
|
|
|
|
else
|
|
|
|
insert into t1 values ("more", x+10);
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
|
|
|
|
insert into t1 values ('foo', 12)|
|
|
|
|
call bug1495()|
|
|
|
|
delete from t1 where id='foo'|
|
|
|
|
insert into t1 values ('bar', 7)|
|
|
|
|
call bug1495()|
|
|
|
|
delete from t1 where id='bar'|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure bug1495|
|
|
|
|
|
2003-10-15 19:03:37 +02:00
|
|
|
#
|
|
|
|
# BUG#1547
|
|
|
|
#
|
|
|
|
create procedure bug1547(s char(16))
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
|
|
|
|
select data into x from t1 where s = id limit 1;
|
|
|
|
if x > 10 then
|
|
|
|
insert into t1 values ("less", x-10);
|
|
|
|
else
|
|
|
|
insert into t1 values ("more", x+10);
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
|
|
|
|
insert into t1 values ("foo", 12), ("bar", 7)|
|
|
|
|
call bug1547("foo")|
|
|
|
|
call bug1547("bar")|
|
|
|
|
select * from t1|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure bug1547|
|
|
|
|
|
2003-10-28 15:43:49 +01:00
|
|
|
#
|
|
|
|
# BUG#1656
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t70|
|
|
|
|
--enable_warnings
|
|
|
|
create table t70 (s1 int,s2 int)|
|
|
|
|
insert into t70 values (1,2)|
|
|
|
|
|
|
|
|
create procedure bug1656(out p1 int, out p2 int)
|
|
|
|
select * into p1, p1 from t70|
|
|
|
|
|
|
|
|
call bug1656(@1, @2)|
|
|
|
|
select @1, @2|
|
|
|
|
drop table t70|
|
|
|
|
drop procedure bug1656|
|
|
|
|
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
#
|
|
|
|
# BUG#1862
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
create table t3(a int)|
|
|
|
|
|
|
|
|
create procedure bug1862()
|
|
|
|
begin
|
|
|
|
insert into t3 values(2);
|
|
|
|
flush tables;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug1862()|
|
|
|
|
# the second call caused a segmentation
|
|
|
|
call bug1862()|
|
|
|
|
select * from t3|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug1862|
|
|
|
|
|
2003-11-20 18:30:02 +01:00
|
|
|
#
|
|
|
|
# BUG#1874
|
|
|
|
#
|
|
|
|
create procedure bug1874()
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
declare y double;
|
|
|
|
select max(data) into x from t1;
|
|
|
|
insert into t2 values ("max", x, 0);
|
|
|
|
select min(data) into x from t1;
|
|
|
|
insert into t2 values ("min", x, 0);
|
|
|
|
select sum(data) into x from t1;
|
|
|
|
insert into t2 values ("sum", x, 0);
|
|
|
|
select avg(data) into y from t1;
|
|
|
|
insert into t2 values ("avg", 0, y);
|
|
|
|
end|
|
|
|
|
|
|
|
|
insert into t1 (data) values (3), (1), (5), (9), (4)|
|
|
|
|
call bug1874()|
|
|
|
|
select * from t2|
|
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
|
|
|
drop procedure bug1874|
|
|
|
|
|
2004-01-08 10:55:10 +01:00
|
|
|
#
|
|
|
|
# BUG#2260
|
|
|
|
#
|
|
|
|
create procedure bug2260()
|
|
|
|
begin
|
|
|
|
declare v1 int;
|
|
|
|
declare c1 cursor for select data from t1;
|
2004-03-29 11:16:45 +02:00
|
|
|
declare continue handler for not found set @x2 = 1;
|
2004-01-08 10:55:10 +01:00
|
|
|
|
|
|
|
open c1;
|
|
|
|
fetch c1 into v1;
|
|
|
|
set @x2 = 2;
|
|
|
|
close c1;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug2260()|
|
|
|
|
select @x2|
|
|
|
|
drop procedure bug2260|
|
|
|
|
|
2004-01-14 18:18:29 +01:00
|
|
|
#
|
|
|
|
# BUG#2267
|
|
|
|
#
|
|
|
|
create procedure bug2267_1()
|
|
|
|
begin
|
|
|
|
show procedure status;
|
|
|
|
end|
|
|
|
|
|
|
|
|
create procedure bug2267_2()
|
|
|
|
begin
|
|
|
|
show function status;
|
|
|
|
end|
|
|
|
|
|
|
|
|
create procedure bug2267_3()
|
|
|
|
begin
|
|
|
|
show create procedure bug2267_1;
|
|
|
|
end|
|
|
|
|
|
|
|
|
create procedure bug2267_4()
|
|
|
|
begin
|
|
|
|
show create function fac;
|
|
|
|
end|
|
|
|
|
|
2004-03-11 17:18:59 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
2004-01-14 18:18:29 +01:00
|
|
|
call bug2267_1()|
|
2004-03-11 17:18:59 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
2004-01-14 18:18:29 +01:00
|
|
|
call bug2267_2()|
|
|
|
|
call bug2267_3()|
|
|
|
|
call bug2267_4()|
|
|
|
|
|
|
|
|
drop procedure bug2267_1|
|
|
|
|
drop procedure bug2267_2|
|
|
|
|
drop procedure bug2267_3|
|
|
|
|
drop procedure bug2267_4|
|
|
|
|
|
2004-01-21 14:28:35 +01:00
|
|
|
#
|
|
|
|
# BUG#2227
|
|
|
|
#
|
|
|
|
create procedure bug2227(x int)
|
|
|
|
begin
|
|
|
|
declare y float default 2.6;
|
|
|
|
declare z char(16) default "zzz";
|
|
|
|
|
|
|
|
select 1.3, x, y, 42, z;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug2227(9)|
|
|
|
|
drop procedure bug2227|
|
|
|
|
|
2004-02-03 15:58:22 +01:00
|
|
|
#
|
|
|
|
# BUG#2614
|
|
|
|
#
|
|
|
|
create procedure bug2614()
|
|
|
|
begin
|
|
|
|
drop table if exists t3;
|
|
|
|
create table t3 (id int default '0' not null);
|
|
|
|
insert into t3 select 12;
|
|
|
|
insert into t3 select * from t3;
|
|
|
|
end|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
call bug2614()|
|
|
|
|
--enable_warnings
|
|
|
|
call bug2614()|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug2614|
|
|
|
|
|
2004-03-17 12:09:03 +01:00
|
|
|
#
|
|
|
|
# BUG#2674
|
|
|
|
#
|
|
|
|
create function bug2674 () returns int
|
|
|
|
return @@sort_buffer_size|
|
|
|
|
|
2004-03-29 11:16:45 +02:00
|
|
|
set @osbs = @@sort_buffer_size|
|
|
|
|
set @@sort_buffer_size = 262000|
|
2004-03-17 12:09:03 +01:00
|
|
|
select bug2674()|
|
|
|
|
drop function bug2674|
|
2004-03-29 11:16:45 +02:00
|
|
|
set @@sort_buffer_size = @osbs|
|
2004-03-17 12:09:03 +01:00
|
|
|
|
2004-03-23 12:04:40 +01:00
|
|
|
#
|
|
|
|
# BUG#3259
|
|
|
|
#
|
|
|
|
create procedure bug3259_1 () begin end|
|
|
|
|
create procedure BUG3259_2 () begin end|
|
|
|
|
create procedure Bug3259_3 () begin end|
|
|
|
|
|
|
|
|
call BUG3259_1()|
|
|
|
|
call BUG3259_1()|
|
|
|
|
call bug3259_2()|
|
|
|
|
call Bug3259_2()|
|
|
|
|
call bug3259_3()|
|
|
|
|
call bUG3259_3()|
|
|
|
|
|
|
|
|
drop procedure bUg3259_1|
|
|
|
|
drop procedure BuG3259_2|
|
|
|
|
drop procedure BUG3259_3|
|
|
|
|
|
2004-04-06 13:26:53 +02:00
|
|
|
#
|
|
|
|
# BUG##2772
|
|
|
|
#
|
|
|
|
create function bug2772() returns char(10) character set latin2
|
|
|
|
return 'a'|
|
|
|
|
|
|
|
|
select bug2772()|
|
|
|
|
drop function bug2772|
|
|
|
|
|
2004-04-06 15:48:58 +02:00
|
|
|
#
|
|
|
|
# BUG#2776
|
|
|
|
#
|
|
|
|
create procedure bug2776_1(out x int)
|
|
|
|
begin
|
|
|
|
declare v int;
|
|
|
|
|
|
|
|
set v = default;
|
|
|
|
set x = v;
|
|
|
|
end|
|
|
|
|
|
|
|
|
create procedure bug2776_2(out x int)
|
|
|
|
begin
|
|
|
|
declare v int default 42;
|
|
|
|
|
|
|
|
set v = default;
|
|
|
|
set x = v;
|
|
|
|
end|
|
|
|
|
|
|
|
|
set @x = 1|
|
|
|
|
call bug2776_1(@x)|
|
|
|
|
select @x|
|
|
|
|
call bug2776_2(@x)|
|
|
|
|
select @x|
|
|
|
|
drop procedure bug2776_1|
|
|
|
|
drop procedure bug2776_2|
|
|
|
|
|
2004-04-06 16:29:38 +02:00
|
|
|
#
|
|
|
|
# BUG#2780
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
create table t3 (s1 smallint)|
|
|
|
|
|
|
|
|
insert into t3 values (123456789012)|
|
|
|
|
|
|
|
|
create procedure bug2780()
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlwarning set @x = 1;
|
|
|
|
|
|
|
|
set @x = 0;
|
|
|
|
insert into t3 values (123456789012);
|
|
|
|
insert into t3 values (0);
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug2780()|
|
|
|
|
select @x|
|
|
|
|
select * from t3|
|
|
|
|
|
|
|
|
drop procedure bug2780|
|
|
|
|
drop table t3|
|
|
|
|
|
2004-05-28 18:33:14 +02:00
|
|
|
#
|
|
|
|
# BUG#1863
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
create table t3 (content varchar(10) )|
|
|
|
|
insert into t3 values ("test1")|
|
|
|
|
insert into t3 values ("test2")|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t4|
|
|
|
|
--enable_warnings
|
|
|
|
create table t4 (f1 int, rc int, t3 int)|
|
|
|
|
|
|
|
|
create procedure bug1863(in1 int)
|
|
|
|
begin
|
|
|
|
|
|
|
|
declare ind int default 0;
|
|
|
|
declare t1 int;
|
|
|
|
declare t2 int;
|
|
|
|
declare t3 int;
|
|
|
|
|
|
|
|
declare rc int default 0;
|
|
|
|
declare continue handler for 1065 set rc = 1;
|
|
|
|
|
|
|
|
drop table if exists temp_t1;
|
|
|
|
create temporary table temp_t1 (
|
|
|
|
f1 int auto_increment, f2 varchar(20), primary key (f1)
|
|
|
|
);
|
|
|
|
|
|
|
|
insert into temp_t1 (f2) select content from t3;
|
|
|
|
|
|
|
|
select f2 into t3 from temp_t1 where f1 = 10;
|
|
|
|
|
|
|
|
if (rc) then
|
|
|
|
insert into t4 values (1, rc, t3);
|
|
|
|
end if;
|
|
|
|
|
|
|
|
insert into t4 values (2, rc, t3);
|
|
|
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug1863(10)|
|
|
|
|
call bug1863(10)|
|
|
|
|
select * from t4|
|
|
|
|
|
|
|
|
drop procedure bug1863|
|
|
|
|
drop table t3, t4|
|
|
|
|
|
|
|
|
#
|
|
|
|
# BUG#2656
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3, t4|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
create table t3 (
|
|
|
|
OrderID int not null,
|
|
|
|
MarketID int,
|
|
|
|
primary key (OrderID)
|
|
|
|
)|
|
|
|
|
|
|
|
|
create table t4 (
|
|
|
|
MarketID int not null,
|
|
|
|
Market varchar(60),
|
|
|
|
Status char(1),
|
|
|
|
primary key (MarketID)
|
|
|
|
)|
|
|
|
|
|
|
|
|
insert t3 (OrderID,MarketID) values (1,1)|
|
|
|
|
insert t3 (OrderID,MarketID) values (2,2)|
|
|
|
|
insert t4 (MarketID,Market,Status) values (1,"MarketID One","A")|
|
|
|
|
insert t4 (MarketID,Market,Status) values (2,"MarketID Two","A")|
|
|
|
|
|
|
|
|
create procedure bug2656_1()
|
|
|
|
begin
|
|
|
|
select
|
|
|
|
m.Market
|
|
|
|
from t4 m JOIN t3 o
|
|
|
|
ON o.MarketID != 1 and o.MarketID = m.MarketID;
|
|
|
|
end |
|
|
|
|
|
|
|
|
create procedure bug2656_2()
|
|
|
|
begin
|
|
|
|
select
|
|
|
|
m.Market
|
|
|
|
from
|
|
|
|
t4 m, t3 o
|
|
|
|
where
|
|
|
|
m.MarketID != 1 and m.MarketID = o.MarketID;
|
|
|
|
|
|
|
|
end |
|
|
|
|
|
|
|
|
call bug2656_1()|
|
|
|
|
call bug2656_1()|
|
|
|
|
call bug2656_2()|
|
|
|
|
call bug2656_2()|
|
|
|
|
drop procedure bug2656_1|
|
|
|
|
drop procedure bug2656_2|
|
|
|
|
drop table t3, t4|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
# BUG#3426
|
|
|
|
#
|
|
|
|
create procedure bug3426(in_time int unsigned, out x int)
|
|
|
|
begin
|
|
|
|
if in_time is null then
|
|
|
|
set @stamped_time=10;
|
|
|
|
set x=1;
|
|
|
|
else
|
|
|
|
set @stamped_time=in_time;
|
|
|
|
set x=2;
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug3426(1000, @i)|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
call bug3426(NULL, @i)|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
# Clear SP cache
|
|
|
|
alter procedure bug3426 sql security invoker|
|
|
|
|
call bug3426(NULL, @i)|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
call bug3426(1000, @i)|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
|
|
|
|
drop procedure bug3426|
|
|
|
|
|
|
|
|
#
|
|
|
|
# BUG#3448
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3, t4|
|
|
|
|
|
|
|
|
create table t3 (
|
|
|
|
a int primary key,
|
|
|
|
ach char(1)
|
|
|
|
) engine = innodb|
|
|
|
|
|
|
|
|
create table t4 (
|
|
|
|
b int primary key ,
|
|
|
|
bch char(1)
|
|
|
|
) engine = innodb|
|
2004-07-13 21:00:00 +02:00
|
|
|
--enable_warnings
|
2004-05-28 18:33:14 +02:00
|
|
|
|
|
|
|
insert into t3 values (1 , 'aCh1' ) , ('2' , 'aCh2')|
|
|
|
|
insert into t4 values (1 , 'bCh1' )|
|
|
|
|
|
|
|
|
create procedure bug3448()
|
|
|
|
select * from t3 inner join t4 on t3.a = t4.b|
|
|
|
|
|
|
|
|
select * from t3 inner join t4 on t3.a = t4.b|
|
|
|
|
call bug3448()|
|
|
|
|
call bug3448()|
|
|
|
|
|
|
|
|
drop procedure bug3448|
|
|
|
|
drop table t3, t4|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
# BUG#3734
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
create table t3 (
|
|
|
|
id int unsigned auto_increment not null primary key,
|
|
|
|
title VARCHAR(200),
|
|
|
|
body text,
|
|
|
|
fulltext (title,body)
|
|
|
|
)|
|
|
|
|
|
|
|
|
insert into t3 (title,body) values
|
|
|
|
('MySQL Tutorial','DBMS stands for DataBase ...'),
|
|
|
|
('How To Use MySQL Well','After you went through a ...'),
|
|
|
|
('Optimizing MySQL','In this tutorial we will show ...'),
|
|
|
|
('1001 MySQL Tricks','1. Never run mysqld as root. 2. ...'),
|
|
|
|
('MySQL vs. YourSQL','In the following database comparison ...'),
|
|
|
|
('MySQL Security','When configured properly, MySQL ...')|
|
|
|
|
|
|
|
|
create procedure bug3734 (param1 varchar(100))
|
|
|
|
select * from t3 where match (title,body) against (param1)|
|
|
|
|
|
|
|
|
call bug3734('database')|
|
|
|
|
call bug3734('Security')|
|
|
|
|
|
|
|
|
drop procedure bug3734|
|
|
|
|
drop table t3|
|
|
|
|
|
|
|
|
#
|
|
|
|
# BUG#3863
|
|
|
|
#
|
|
|
|
create procedure bug3863()
|
|
|
|
begin
|
|
|
|
set @a = 0;
|
|
|
|
while @a < 5 do
|
|
|
|
set @a = @a + 1;
|
|
|
|
end while;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug3863()|
|
|
|
|
select @a|
|
|
|
|
call bug3863()|
|
|
|
|
select @a|
|
|
|
|
|
|
|
|
drop procedure bug3863|
|
|
|
|
|
2004-05-28 19:43:06 +02:00
|
|
|
#
|
|
|
|
# BUG#2460
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
create table t3 (
|
|
|
|
id int(10) unsigned not null default 0,
|
|
|
|
rid int(10) unsigned not null default 0,
|
|
|
|
msg text not null,
|
|
|
|
primary key (id),
|
|
|
|
unique key rid (rid, id)
|
|
|
|
)|
|
|
|
|
|
|
|
|
create procedure bug2460_1(in v int)
|
|
|
|
begin
|
|
|
|
( select n0.id from t3 as n0 where n0.id = v )
|
|
|
|
union
|
|
|
|
( select n0.id from t3 as n0, t3 as n1
|
|
|
|
where n0.id = n1.rid and n1.id = v )
|
|
|
|
union
|
|
|
|
( select n0.id from t3 as n0, t3 as n1, t3 as n2
|
|
|
|
where n0.id = n1.rid and n1.id = n2.rid and n2.id = v );
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug2460_1(2)|
|
|
|
|
call bug2460_1(2)|
|
|
|
|
insert into t3 values (1, 1, 'foo'), (2, 1, 'bar'), (3, 1, 'zip zap')|
|
|
|
|
call bug2460_1(2)|
|
|
|
|
call bug2460_1(2)|
|
|
|
|
|
|
|
|
create procedure bug2460_2()
|
|
|
|
begin
|
|
|
|
drop table if exists t3;
|
|
|
|
create table t3 (s1 int);
|
|
|
|
insert into t3 select 1 union select 1;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug2460_2()|
|
|
|
|
call bug2460_2()|
|
|
|
|
select * from t3|
|
|
|
|
|
|
|
|
drop procedure bug2460_1|
|
|
|
|
drop procedure bug2460_2|
|
|
|
|
drop table t3|
|
|
|
|
|
2003-11-20 18:30:02 +01:00
|
|
|
|
2004-06-09 14:19:43 +02:00
|
|
|
#
|
|
|
|
# BUG#2564
|
|
|
|
#
|
|
|
|
set @@sql_mode = ''|
|
|
|
|
create procedure bug2564_1()
|
|
|
|
comment 'Joe''s procedure'
|
|
|
|
insert into `t1` values ("foo", 1)|
|
|
|
|
|
|
|
|
set @@sql_mode = 'ANSI_QUOTES'|
|
|
|
|
create procedure bug2564_2()
|
|
|
|
insert into "t1" values ('foo', 1)|
|
|
|
|
|
|
|
|
delimiter $|
|
|
|
|
set @@sql_mode = ''$
|
|
|
|
create function bug2564_3(x int, y int) returns int
|
|
|
|
return x || y$
|
|
|
|
|
|
|
|
set @@sql_mode = 'ANSI'$
|
|
|
|
create function bug2564_4(x int, y int) returns int
|
|
|
|
return x || y$
|
|
|
|
delimiter |$
|
|
|
|
|
|
|
|
set @@sql_mode = ''|
|
|
|
|
show create procedure bug2564_1|
|
|
|
|
show create procedure bug2564_2|
|
|
|
|
show create function bug2564_3|
|
|
|
|
show create function bug2564_4|
|
|
|
|
|
|
|
|
drop procedure bug2564_1|
|
|
|
|
drop procedure bug2564_2|
|
|
|
|
drop function bug2564_3|
|
|
|
|
drop function bug2564_4|
|
|
|
|
|
2004-06-10 17:07:53 +02:00
|
|
|
#
|
|
|
|
# BUG#3132
|
|
|
|
#
|
|
|
|
create function bug3132(s char(20)) returns char(50)
|
|
|
|
return concat('Hello, ', s, '!')|
|
|
|
|
|
|
|
|
select bug3132('Bob') union all select bug3132('Judy')|
|
|
|
|
drop function bug3132|
|
|
|
|
|
2004-06-14 12:38:54 +02:00
|
|
|
#
|
|
|
|
# BUG#3843
|
|
|
|
#
|
|
|
|
create procedure bug3843()
|
|
|
|
analyze table t1|
|
|
|
|
|
|
|
|
# Testing for packets out of order
|
|
|
|
call bug3843()|
|
|
|
|
call bug3843()|
|
|
|
|
select 1+2|
|
|
|
|
|
|
|
|
drop procedure bug3843|
|
|
|
|
|
2004-06-15 14:26:19 +02:00
|
|
|
#
|
|
|
|
# BUG#3368
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
create table t3 ( s1 char(10) )|
|
|
|
|
insert into t3 values ('a'), ('b')|
|
|
|
|
|
|
|
|
create procedure bug3368(v char(10))
|
|
|
|
begin
|
|
|
|
select group_concat(v) from t3;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug3368('x')|
|
|
|
|
call bug3368('yz')|
|
|
|
|
drop procedure bug3368|
|
|
|
|
drop table t3|
|
|
|
|
|
2004-07-22 16:46:59 +02:00
|
|
|
#
|
|
|
|
# BUG#4579
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
create table t3 (f1 int, f2 int);
|
|
|
|
insert into t3 values (1,1);
|
|
|
|
|
|
|
|
create procedure bug4579_1 ()
|
|
|
|
begin
|
|
|
|
declare sf1 int;
|
|
|
|
|
|
|
|
select f1 into sf1 from t3 where f1=1 and f2=1;
|
|
|
|
update t3 set f2 = f2 + 1 where f1=1 and f2=1;
|
|
|
|
call bug4579_2();
|
|
|
|
end|
|
|
|
|
|
|
|
|
create procedure bug4579_2 ()
|
|
|
|
begin
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug4579_1()|
|
|
|
|
call bug4579_1()|
|
|
|
|
call bug4579_1()|
|
|
|
|
|
|
|
|
drop procedure bug4579_1|
|
|
|
|
drop procedure bug4579_2|
|
|
|
|
drop table t3|
|
|
|
|
|
2004-06-09 14:19:43 +02:00
|
|
|
|
2004-07-23 19:52:06 +02:00
|
|
|
#
|
|
|
|
# BUG#4726
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
create table t3 (f1 int, f2 int, f3 int)|
|
|
|
|
insert into t3 values (1,1,1)|
|
|
|
|
|
|
|
|
create procedure bug4726()
|
|
|
|
begin
|
|
|
|
declare tmp_o_id INT;
|
|
|
|
declare tmp_d_id INT default 1;
|
|
|
|
|
|
|
|
while tmp_d_id <= 2 do
|
|
|
|
begin
|
|
|
|
select f1 into tmp_o_id from t3 where f2=1 and f3=1;
|
|
|
|
set tmp_d_id = tmp_d_id + 1;
|
|
|
|
end;
|
|
|
|
end while;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug4726()|
|
|
|
|
call bug4726()|
|
|
|
|
call bug4726()|
|
|
|
|
|
|
|
|
drop procedure bug4726|
|
|
|
|
drop table t3|
|
|
|
|
|
2004-07-29 16:52:17 +02:00
|
|
|
#
|
|
|
|
# BUG#4318
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
create table t3 (s1 int)|
|
|
|
|
insert into t3 values (3), (4)|
|
|
|
|
|
|
|
|
create procedure bug4318()
|
|
|
|
handler t3 read next|
|
|
|
|
|
|
|
|
handler t3 open|
|
|
|
|
# Expect no results, as tables are closed, but there shouldn't be any errors
|
|
|
|
call bug4318()|
|
|
|
|
call bug4318()|
|
|
|
|
handler t3 close|
|
|
|
|
|
|
|
|
drop procedure bug4318|
|
|
|
|
drop table t3|
|
|
|
|
|
2004-08-06 13:47:01 +02:00
|
|
|
#
|
|
|
|
# BUG#4902: Stored procedure with SHOW WARNINGS leads to packet error
|
|
|
|
#
|
|
|
|
# Added tests for most other show commands we could find too.
|
|
|
|
# (Skipping those already tested, and the ones depending on optional handlers.)
|
|
|
|
#
|
|
|
|
# Note: This will return a large number of results of different formats,
|
|
|
|
# which makes it impossible to filter with --replace_column.
|
|
|
|
# It's possible that some of these are not deterministic across
|
|
|
|
# platforms. If so, just remove the offending command.
|
|
|
|
#
|
|
|
|
create procedure bug4902()
|
|
|
|
begin
|
|
|
|
show charset like 'foo';
|
|
|
|
show collation like 'foo';
|
|
|
|
show column types;
|
|
|
|
show create table t1;
|
|
|
|
show create database test;
|
|
|
|
show databases like 'foo';
|
|
|
|
show errors;
|
|
|
|
show columns from t1;
|
|
|
|
show grants for 'root'@'localhost';
|
|
|
|
show keys from t1;
|
|
|
|
show master status;
|
|
|
|
show open tables like 'foo';
|
|
|
|
show privileges;
|
|
|
|
show slave hosts;
|
|
|
|
show slave status;
|
|
|
|
show status like 'foo';
|
|
|
|
show tables like 'foo';
|
|
|
|
show variables like 'foo';
|
|
|
|
show warnings;
|
|
|
|
end|
|
2004-08-06 17:04:55 +02:00
|
|
|
#show binlog events;
|
2004-08-06 13:47:01 +02:00
|
|
|
#show storage engines;
|
|
|
|
|
|
|
|
call bug4902()|
|
|
|
|
call bug4902()|
|
|
|
|
|
|
|
|
drop procedure bug4902|
|
|
|
|
|
2004-08-13 18:02:52 +02:00
|
|
|
# We need separate SP for SHOW PROCESSLIST since we want use replace_column
|
|
|
|
create procedure bug4902_2()
|
|
|
|
begin
|
|
|
|
show processlist;
|
|
|
|
end|
|
2004-08-17 20:20:58 +02:00
|
|
|
--replace_column 1 # 6 #
|
2004-08-13 18:02:52 +02:00
|
|
|
call bug4902_2()|
|
2004-08-17 20:20:58 +02:00
|
|
|
--replace_column 1 # 6 #
|
2004-08-13 18:02:52 +02:00
|
|
|
call bug4902_2()|
|
|
|
|
drop procedure bug4902_2|
|
|
|
|
|
2004-08-06 15:21:28 +02:00
|
|
|
#
|
|
|
|
# BUG#4904
|
|
|
|
#
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists t3|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
create procedure bug4904()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlstate 'HY000' begin end;
|
|
|
|
|
|
|
|
create table t2 as select * from t;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call bug4904()|
|
|
|
|
|
|
|
|
drop procedure bug4904|
|
|
|
|
|
2004-06-09 14:19:43 +02:00
|
|
|
|
2003-03-06 19:16:46 +01:00
|
|
|
#
|
|
|
|
# Some "real" examples
|
|
|
|
#
|
|
|
|
|
|
|
|
# fac
|
2003-03-03 15:03:19 +01:00
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists fac|
|
|
|
|
--enable_warnings
|
|
|
|
create table fac (n int unsigned not null primary key, f bigint unsigned)|
|
|
|
|
|
|
|
|
create procedure ifac(n int unsigned)
|
|
|
|
begin
|
2003-03-30 13:25:43 +02:00
|
|
|
declare i int unsigned default 1;
|
|
|
|
|
2003-03-03 15:03:19 +01:00
|
|
|
if n > 20 then
|
|
|
|
set n = 20; # bigint overflow otherwise
|
|
|
|
end if;
|
|
|
|
while i <= n do
|
|
|
|
begin
|
|
|
|
insert into test.fac values (i, fac(i));
|
|
|
|
set i = i + 1;
|
|
|
|
end;
|
|
|
|
end while;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call ifac(20)|
|
|
|
|
select * from fac|
|
|
|
|
drop table fac|
|
2004-03-11 17:18:59 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
2003-11-17 18:21:36 +01:00
|
|
|
show function status like '%f%'|
|
2003-03-03 15:03:19 +01:00
|
|
|
drop procedure ifac|
|
|
|
|
drop function fac|
|
2004-03-11 17:18:59 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
2003-11-20 15:07:22 +01:00
|
|
|
show function status like '%f%'|
|
2003-03-03 15:03:19 +01:00
|
|
|
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
|
|
# primes
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists primes|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
create table primes (
|
|
|
|
i int unsigned not null primary key,
|
|
|
|
p bigint unsigned not null
|
|
|
|
)|
|
|
|
|
|
|
|
|
insert into primes values
|
|
|
|
( 0, 3), ( 1, 5), ( 2, 7), ( 3, 11), ( 4, 13),
|
|
|
|
( 5, 17), ( 6, 19), ( 7, 23), ( 8, 29), ( 9, 31),
|
|
|
|
(10, 37), (11, 41), (12, 43), (13, 47), (14, 53),
|
|
|
|
(15, 59), (16, 61), (17, 67), (18, 71), (19, 73),
|
|
|
|
(20, 79), (21, 83), (22, 89), (23, 97), (24, 101),
|
|
|
|
(25, 103), (26, 107), (27, 109), (28, 113), (29, 127),
|
|
|
|
(30, 131), (31, 137), (32, 139), (33, 149), (34, 151),
|
|
|
|
(35, 157), (36, 163), (37, 167), (38, 173), (39, 179),
|
|
|
|
(40, 181), (41, 191), (42, 193), (43, 197), (44, 199)|
|
|
|
|
|
|
|
|
create procedure opp(n bigint unsigned, out pp bool)
|
|
|
|
begin
|
|
|
|
declare r double;
|
2003-03-30 13:25:43 +02:00
|
|
|
declare b, s bigint unsigned default 0;
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
|
|
set r = sqrt(n);
|
|
|
|
|
|
|
|
again:
|
|
|
|
loop
|
|
|
|
if s = 45 then
|
|
|
|
set b = b+200, s = 0;
|
|
|
|
else
|
|
|
|
begin
|
|
|
|
declare p bigint unsigned;
|
|
|
|
|
|
|
|
select t.p into p from test.primes t where t.i = s;
|
|
|
|
if b+p > r then
|
|
|
|
set pp = 1;
|
|
|
|
leave again;
|
|
|
|
end if;
|
|
|
|
if mod(n, b+p) = 0 then
|
|
|
|
set pp = 0;
|
|
|
|
leave again;
|
|
|
|
end if;
|
|
|
|
set s = s+1;
|
|
|
|
end;
|
|
|
|
end if;
|
Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
- ITERATE in labelled BEGIN-END (not allowed).
- Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
- Empty BEGIN-END (now allowed).
- End label (now optional).
include/mysqld_error.h:
New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/r/sp.result:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
mysql-test/t/sp-error.test:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/t/sp.test:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
sql/lex.h:
New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
sql/sp_pcontext.h:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
End-labels in SPs loop and begin-end blocks are now optional.
SQLSTATE [VALUE] added to syntax for sqlstates.
Check for duplicate variable, condition and cursor declarations, but
only in the same scope.
Empty BEGIN-END statements now allowed.
Check if ITERATE is referring to a BEGIN label.
2003-11-13 19:34:56 +01:00
|
|
|
end loop;
|
2003-03-06 19:16:46 +01:00
|
|
|
end|
|
|
|
|
|
|
|
|
create procedure ip(m int unsigned)
|
|
|
|
begin
|
|
|
|
declare p bigint unsigned;
|
|
|
|
declare i int unsigned;
|
|
|
|
|
|
|
|
set i=45, p=201;
|
|
|
|
|
|
|
|
while i < m do
|
|
|
|
begin
|
2003-03-30 13:25:43 +02:00
|
|
|
declare pp bool default 0;
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
|
|
call opp(p, pp);
|
|
|
|
if pp then
|
|
|
|
insert into test.primes values (i, p);
|
|
|
|
set i = i+1;
|
|
|
|
end if;
|
|
|
|
set p = p+2;
|
|
|
|
end;
|
|
|
|
end while;
|
|
|
|
end|
|
2003-11-17 18:21:36 +01:00
|
|
|
show create procedure opp|
|
2004-03-11 17:18:59 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
2003-11-17 18:21:36 +01:00
|
|
|
show procedure status like '%p%'|
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
|
|
# This isn't the fastest way in the world to compute prime numbers, so
|
2003-04-04 15:47:43 +02:00
|
|
|
# don't be too ambitious. ;-)
|
2003-03-20 11:57:05 +01:00
|
|
|
call ip(200)|
|
2003-03-06 19:16:46 +01:00
|
|
|
# We don't want to select the entire table here, just pick a few
|
|
|
|
# examples.
|
2004-05-13 13:29:18 +02:00
|
|
|
# The expected result is:
|
|
|
|
# i p
|
|
|
|
# --- ----
|
|
|
|
# 45 211
|
|
|
|
# 100 557
|
|
|
|
# 199 1229
|
2003-03-20 11:57:05 +01:00
|
|
|
select * from primes where i=45 or i=100 or i=199|
|
2003-03-06 19:16:46 +01:00
|
|
|
drop table primes|
|
|
|
|
drop procedure opp|
|
|
|
|
drop procedure ip|
|
2004-03-11 17:18:59 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
2003-11-20 15:07:22 +01:00
|
|
|
show procedure status like '%p%'|
|
2003-03-06 19:16:46 +01:00
|
|
|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
|
|
|
# Fibonacci, for recursion test. (Yet Another Numerical series :)
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
drop table if exists fib|
|
|
|
|
--enable_warnings
|
|
|
|
create table fib ( f bigint unsigned not null )|
|
|
|
|
|
|
|
|
insert into fib values (1), (1)|
|
|
|
|
|
|
|
|
# We deliberately do it the awkward way, fetching the last two
|
|
|
|
# values from the table, in order to exercise various statements
|
|
|
|
# and table accesses at each turn.
|
|
|
|
create procedure fib(n int unsigned)
|
|
|
|
begin
|
|
|
|
if n > 0 then
|
|
|
|
begin
|
|
|
|
declare x, y bigint unsigned;
|
|
|
|
declare c cursor for select f from fib order by f desc limit 2;
|
|
|
|
|
|
|
|
open c;
|
|
|
|
fetch c into y;
|
|
|
|
fetch c into x;
|
|
|
|
close c;
|
|
|
|
insert into fib values (x+y);
|
|
|
|
call fib(n-1);
|
|
|
|
end;
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
|
|
|
|
call fib(20)|
|
|
|
|
|
|
|
|
select * from fib order by f asc|
|
|
|
|
drop table fib|
|
|
|
|
drop procedure fib|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
2003-11-17 18:21:36 +01:00
|
|
|
# Comment & suid
|
2003-12-05 18:52:33 +01:00
|
|
|
#
|
|
|
|
|
2003-11-17 18:21:36 +01:00
|
|
|
create procedure bar(x char(16), y int)
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
comment "111111111111" sql security invoker
|
2003-11-17 18:21:36 +01:00
|
|
|
insert into test.t1 values (x, y)|
|
2004-03-11 17:18:59 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
2003-11-17 18:21:36 +01:00
|
|
|
show procedure status like 'bar'|
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
alter procedure bar name bar2 comment "2222222222" sql security definer|
|
2003-11-17 18:21:36 +01:00
|
|
|
alter procedure bar2 name bar comment "3333333333"|
|
|
|
|
alter procedure bar|
|
|
|
|
show create procedure bar|
|
2004-03-11 17:18:59 +01:00
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
2003-11-17 18:21:36 +01:00
|
|
|
show procedure status like 'bar'|
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
drop procedure bar|
|
2003-02-19 12:42:32 +01:00
|
|
|
delimiter ;|
|
2003-01-17 14:38:05 +01:00
|
|
|
drop table t1;
|
2003-03-02 19:17:41 +01:00
|
|
|
drop table t2;
|
2004-05-20 01:02:49 +02:00
|
|
|
|
|
|
|
#
|
|
|
|
# rexecution
|
|
|
|
#
|
|
|
|
create procedure p1 () select (select s1 from t1) from t1;
|
|
|
|
create table t1 (s1 int);
|
|
|
|
call p1();
|
|
|
|
insert into t1 values (1);
|
|
|
|
call p1();
|
|
|
|
drop procedure p1;
|
|
|
|
drop table t1;
|
|
|
|
|