2003-01-17 14:38:05 +01:00
|
|
|
use test;
|
|
|
|
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
|
|
|
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
|
|
|
create procedure foo42()
|
|
|
|
insert into test.t1 values ("foo", 42);
|
2003-02-19 12:42:32 +01:00
|
|
|
call foo42();
|
|
|
|
select * from t1;
|
|
|
|
id data
|
|
|
|
foo 42
|
|
|
|
delete from t1;
|
|
|
|
drop procedure foo42;
|
2003-03-26 15:02:48 +01:00
|
|
|
create procedure u()
|
|
|
|
use sptmp;
|
2003-04-02 20:42:28 +02:00
|
|
|
drop database if exists sptmp;
|
2003-03-26 15:02:48 +01:00
|
|
|
create database sptmp;
|
|
|
|
use test;
|
|
|
|
call u();
|
|
|
|
select database();
|
|
|
|
database()
|
|
|
|
test
|
|
|
|
drop database sptmp;
|
|
|
|
drop procedure u;
|
2003-01-17 14:38:05 +01:00
|
|
|
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;
|
|
|
|
id data
|
|
|
|
bar 666
|
|
|
|
delete from t1;
|
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
|
|
|
create procedure empty()
|
|
|
|
begin
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call empty()|
|
|
|
|
drop procedure empty|
|
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
|
|
|
create procedure scope(a int, b float)
|
|
|
|
begin
|
|
|
|
declare b int;
|
|
|
|
declare c float;
|
|
|
|
begin
|
|
|
|
declare c int;
|
|
|
|
end;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
drop procedure scope|
|
2003-01-17 14:38:05 +01:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call two("one", "two", 3)|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
|
|
|
one 3
|
|
|
|
two 3
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure two|
|
2003-01-17 14:38:05 +01:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call locset("locset", 19)|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
|
|
|
locset 21
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure locset|
|
|
|
|
drop table if exists t3|
|
|
|
|
create table t3 ( d date, i int, f double, s varchar(32) )|
|
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
|
|
|
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");
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call nullset()|
|
|
|
|
select * from t3|
|
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
|
|
|
d i f s
|
|
|
|
NULL NULL NULL NULL
|
2003-11-20 16:14:24 +01:00
|
|
|
NULL 1 1 ld is null
|
|
|
|
NULL 1 1 li is null
|
|
|
|
NULL NULL NULL li = 0
|
|
|
|
NULL 1 1 lf is null
|
|
|
|
NULL NULL NULL lf = 0
|
|
|
|
NULL 1 1 ls is null
|
2003-12-16 18:09:22 +01:00
|
|
|
drop table t3|
|
|
|
|
drop procedure nullset|
|
2003-01-17 14:38:05 +01:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call mixset("mixset", 19)|
|
|
|
|
show variables like 'max_join_size'|
|
2003-02-19 12:42:32 +01:00
|
|
|
Variable_name Value
|
|
|
|
max_join_size 100
|
2003-12-16 18:09:22 +01:00
|
|
|
select id,data,@z from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data @z
|
|
|
|
mixset 666 19
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure mixset|
|
2003-01-17 14:38:05 +01:00
|
|
|
create procedure zip(x char(16), y int)
|
|
|
|
begin
|
|
|
|
declare z int;
|
|
|
|
call zap(y, z);
|
|
|
|
call bar(x, z);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
2003-01-17 14:38:05 +01:00
|
|
|
create procedure zap(x int, out y int)
|
|
|
|
begin
|
|
|
|
declare z int;
|
|
|
|
set z = x+1, y = z;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call zip("zip", 99)|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
|
|
|
zip 100
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure zip|
|
|
|
|
drop procedure bar|
|
|
|
|
call zap(7, @zap)|
|
|
|
|
select @zap|
|
2003-10-16 15:45:27 +02:00
|
|
|
@zap
|
|
|
|
8
|
2003-12-16 18:09:22 +01:00
|
|
|
drop procedure zap|
|
2003-05-23 15:32:31 +02:00
|
|
|
create procedure c1(x int)
|
2003-12-16 18:09:22 +01:00
|
|
|
call c2("c", x)|
|
2003-05-23 15:32:31 +02:00
|
|
|
create procedure c2(s char(16), x int)
|
2003-12-16 18:09:22 +01:00
|
|
|
call c3(x, s)|
|
2003-05-23 15:32:31 +02:00
|
|
|
create procedure c3(x int, s char(16))
|
2003-12-16 18:09:22 +01:00
|
|
|
call c4("level", x, s)|
|
2003-05-23 15:32:31 +02:00
|
|
|
create procedure c4(l char(8), x int, s char(16))
|
2003-12-16 18:09:22 +01:00
|
|
|
insert into t1 values (concat(l,s), x)|
|
|
|
|
call c1(42)|
|
|
|
|
select * from t1|
|
2003-05-23 15:32:31 +02:00
|
|
|
id data
|
|
|
|
levelc 42
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure c1|
|
|
|
|
drop procedure c2|
|
|
|
|
drop procedure c3|
|
|
|
|
drop procedure c4|
|
2003-01-17 14:38:05 +01:00
|
|
|
create procedure iotest(x1 char(16), x2 char(16), y int)
|
|
|
|
begin
|
|
|
|
call inc2(x2, y);
|
|
|
|
insert into test.t1 values (x1, y);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
2003-01-17 14:38:05 +01:00
|
|
|
create procedure inc2(x char(16), y int)
|
|
|
|
begin
|
|
|
|
call inc(y);
|
|
|
|
insert into test.t1 values (x, y);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
2003-01-17 14:38:05 +01:00
|
|
|
create procedure inc(inout io int)
|
2003-12-16 18:09:22 +01:00
|
|
|
set io = io + 1|
|
|
|
|
call iotest("io1", "io2", 1)|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
|
|
|
io2 2
|
|
|
|
io1 1
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure iotest|
|
|
|
|
drop procedure inc2|
|
2003-10-16 15:45:27 +02:00
|
|
|
create procedure incr(inout x int)
|
2003-12-16 18:09:22 +01:00
|
|
|
call inc(x)|
|
|
|
|
select @zap|
|
2003-10-16 15:45:27 +02:00
|
|
|
@zap
|
|
|
|
8
|
2003-12-16 18:09:22 +01:00
|
|
|
call incr(@zap)|
|
|
|
|
select @zap|
|
2003-10-16 15:45:27 +02:00
|
|
|
@zap
|
|
|
|
9
|
2003-12-16 18:09:22 +01:00
|
|
|
drop procedure inc|
|
|
|
|
drop procedure incr|
|
2003-01-17 14:38:05 +01:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
2003-01-17 14:38:05 +01:00
|
|
|
create procedure cbv2(y1 int, inout y2 int)
|
|
|
|
begin
|
|
|
|
set y2 = 4711;
|
|
|
|
insert into test.t1 values ("cbv2", y1);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call cbv1()|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
|
|
|
cbv2 4
|
|
|
|
cbv1 4711
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure cbv1|
|
|
|
|
drop procedure cbv2|
|
|
|
|
insert into t2 values ("a", 1, 1.1), ("b", 2, 1.2), ("c", 3, 1.3)|
|
2003-04-27 17:35:54 +02:00
|
|
|
create procedure sub1(id char(16), x int)
|
2003-12-16 18:09:22 +01:00
|
|
|
insert into test.t1 values (id, x)|
|
2003-04-27 17:35:54 +02:00
|
|
|
create function sub3(i int) returns int
|
2003-12-16 18:09:22 +01:00
|
|
|
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))|
|
|
|
|
select * from t1|
|
2003-04-27 17:35:54 +02:00
|
|
|
id data
|
|
|
|
sub1a 7
|
|
|
|
sub1b 3
|
|
|
|
sub1c 1
|
|
|
|
sub1d 1
|
2003-12-16 18:09:22 +01:00
|
|
|
select sub3((select max(i) from t2))|
|
2003-04-27 17:35:54 +02:00
|
|
|
sub3((select max(i) from t2))
|
|
|
|
4
|
2003-12-16 18:09:22 +01:00
|
|
|
drop procedure sub1|
|
|
|
|
drop function sub3|
|
|
|
|
delete from t2|
|
2003-01-17 14:38:05 +01:00
|
|
|
create procedure a0(x int)
|
|
|
|
while x do
|
|
|
|
set x = x-1;
|
|
|
|
insert into test.t1 values ("a0", x);
|
2003-12-16 18:09:22 +01:00
|
|
|
end while|
|
|
|
|
call a0(3)|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
2003-04-27 17:35:54 +02:00
|
|
|
sub1a 7
|
|
|
|
sub1b 3
|
|
|
|
sub1c 1
|
|
|
|
sub1d 1
|
2003-02-19 12:42:32 +01:00
|
|
|
a0 2
|
|
|
|
a0 1
|
|
|
|
a0 0
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure a0|
|
2003-01-17 14:38:05 +01:00
|
|
|
create procedure a(x int)
|
|
|
|
while x > 0 do
|
|
|
|
set x = x-1;
|
|
|
|
insert into test.t1 values ("a", x);
|
2003-12-16 18:09:22 +01:00
|
|
|
end while|
|
|
|
|
call a(3)|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
|
|
|
a 2
|
|
|
|
a 1
|
|
|
|
a 0
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure a|
|
2003-01-17 14:38:05 +01:00
|
|
|
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-12-16 18:09:22 +01:00
|
|
|
until x = 0 end repeat|
|
|
|
|
call b(3)|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
|
|
|
bbb 3
|
|
|
|
bbb 2
|
|
|
|
bbb 1
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure b|
|
2003-01-23 14:00:32 +01:00
|
|
|
create procedure b2(x int)
|
|
|
|
repeat(select 1 into outfile 'b2');
|
|
|
|
insert into test.t1 values (repeat("b2",3), x);
|
|
|
|
set x = x-1;
|
2003-12-16 18:09:22 +01:00
|
|
|
until x = 0 end repeat|
|
|
|
|
drop procedure b2|
|
2003-01-17 14:38:05 +01:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end while hmm|
|
|
|
|
call c(3)|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
|
|
|
c 3
|
|
|
|
c 2
|
|
|
|
c 1
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure c|
|
2003-01-17 14:38:05 +01:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end while|
|
|
|
|
call d(3)|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
|
|
|
d 3
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure d|
|
2003-01-17 14:38:05 +01:00
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end loop foo|
|
|
|
|
call e(3)|
|
|
|
|
select * from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
id data
|
|
|
|
e 3
|
|
|
|
e 2
|
|
|
|
e 1
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure e|
|
2003-01-17 14:38:05 +01:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end if|
|
|
|
|
call f(-2)|
|
|
|
|
call f(0)|
|
|
|
|
call f(4)|
|
|
|
|
select * from t1|
|
2003-01-17 14:38:05 +01:00
|
|
|
id data
|
|
|
|
f 0
|
|
|
|
f 1
|
|
|
|
f 2
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure f|
|
2003-02-19 12:42:32 +01:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end case|
|
|
|
|
call g(-42)|
|
|
|
|
call g(0)|
|
|
|
|
call g(1)|
|
|
|
|
select * from t1|
|
2003-01-17 14:38:05 +01:00
|
|
|
id data
|
|
|
|
g 0
|
|
|
|
g 1
|
|
|
|
g 2
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure g|
|
2003-02-19 12:42:32 +01:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end case|
|
|
|
|
call h(0)|
|
|
|
|
call h(1)|
|
|
|
|
call h(17)|
|
|
|
|
select * from t1|
|
2003-01-17 14:38:05 +01:00
|
|
|
id data
|
|
|
|
h0 0
|
|
|
|
h1 1
|
|
|
|
h? 17
|
2003-12-16 18:09:22 +01:00
|
|
|
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
|
|
|
create procedure i(x int)
|
|
|
|
foo:
|
|
|
|
begin
|
|
|
|
if x = 0 then
|
|
|
|
leave foo;
|
|
|
|
end if;
|
|
|
|
insert into test.t1 values ("i", x);
|
2003-12-16 18:09:22 +01:00
|
|
|
end foo|
|
|
|
|
call i(0)|
|
|
|
|
call i(3)|
|
|
|
|
select * from t1|
|
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
|
|
|
id data
|
|
|
|
i 3
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure i|
|
|
|
|
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()|
|
|
|
|
id data
|
|
|
|
foo 3
|
|
|
|
bar 19
|
|
|
|
drop procedure sel1|
|
|
|
|
create procedure sel2()
|
|
|
|
begin
|
|
|
|
select * from t1;
|
|
|
|
select * from t2;
|
|
|
|
end|
|
|
|
|
call sel2()|
|
|
|
|
id data
|
|
|
|
foo 3
|
|
|
|
bar 19
|
|
|
|
s i d
|
|
|
|
x 9 4.1
|
|
|
|
y -1 19.2
|
|
|
|
z 3 2.2
|
|
|
|
drop procedure sel2|
|
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
2003-02-19 12:42:32 +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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call into_test("into", 100)|
|
|
|
|
select * from t1|
|
2003-01-18 17:21:13 +01:00
|
|
|
id data
|
2003-02-02 17:41:21 +01:00
|
|
|
into 100
|
|
|
|
into2 102
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure into_test|
|
2003-02-19 12:42:32 +01:00
|
|
|
create procedure into_test2(x char(16), y int)
|
|
|
|
begin
|
|
|
|
insert into test.t1 values (x, y);
|
|
|
|
select id,data into x,@z from test.t1 limit 1;
|
|
|
|
insert into test.t1 values (concat(x, "2"), y+2);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call into_test2("into", 100)|
|
|
|
|
select id,data,@z from t1|
|
2003-02-02 17:41:21 +01:00
|
|
|
id data @z
|
|
|
|
into 100 100
|
|
|
|
into2 102 100
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure into_test2|
|
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
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
insert into t1 values ("into3", 19)|
|
|
|
|
call into_test3()|
|
|
|
|
call into_test3()|
|
|
|
|
select * from t2|
|
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
|
|
|
s i d
|
|
|
|
into3 19 0
|
|
|
|
into3 19 0
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
|
|
|
drop procedure into_test3|
|
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
|
|
|
create procedure into_test4()
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
select data into x from test.t1 limit 1;
|
|
|
|
insert into test.t3 values ("into4", x);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
delete from t1|
|
|
|
|
drop table if exists t3|
|
|
|
|
create table t3 ( s char(16), d int)|
|
|
|
|
call into_test4()|
|
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
|
|
|
Warnings:
|
2003-12-16 18:09:22 +01:00
|
|
|
select * from t3|
|
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
|
|
|
s d
|
|
|
|
into4 NULL
|
2003-12-16 18:09:22 +01:00
|
|
|
insert into t1 values ("i4", 77)|
|
|
|
|
call into_test4()|
|
|
|
|
select * from t3|
|
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
|
|
|
s d
|
|
|
|
into4 NULL
|
|
|
|
into4 77
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure into_test4|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call into_outfile("ofile", 1)|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure into_outfile|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call into_dumpfile("dfile", 1)|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure into_dumpfile|
|
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-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
drop table if exists t3|
|
|
|
|
call create_select("cs", 90)|
|
|
|
|
select * from t1, t3|
|
2003-04-04 15:47:43 +02:00
|
|
|
id data id data
|
|
|
|
cs 90 cs 90
|
|
|
|
cs 90 cs2 92
|
2003-12-16 18:09:22 +01:00
|
|
|
drop table if exists t3|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure create_select|
|
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 e() returns double
|
2003-12-16 18:09:22 +01:00
|
|
|
return 2.7182818284590452354|
|
|
|
|
set @e = e()|
|
|
|
|
select e(), @e|
|
2003-02-27 19:08:52 +01:00
|
|
|
e() @e
|
|
|
|
2.718281828459 2.718281828459
|
2003-02-26 19:22:29 +01:00
|
|
|
create function inc(i int) returns int
|
2003-12-16 18:09:22 +01:00
|
|
|
return i+1|
|
|
|
|
select inc(1), inc(99), inc(-71)|
|
2003-02-26 19:22:29 +01:00
|
|
|
inc(1) inc(99) inc(-71)
|
|
|
|
2 100 -70
|
|
|
|
create function mul(x int, y int) returns int
|
2003-12-16 18:09:22 +01:00
|
|
|
return x*y|
|
|
|
|
select mul(1,1), mul(3,5), mul(4711, 666)|
|
2003-02-26 19:22:29 +01:00
|
|
|
mul(1,1) mul(3,5) mul(4711, 666)
|
|
|
|
1 15 3137526
|
2003-02-27 19:08:52 +01:00
|
|
|
create function append(s1 char(8), s2 char(8)) returns char(16)
|
2003-12-16 18:09:22 +01:00
|
|
|
return concat(s1, s2)|
|
|
|
|
select append("foo", "bar")|
|
2003-02-27 19:08:52 +01:00
|
|
|
append("foo", "bar")
|
|
|
|
foobar
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
select fac(1), fac(2), fac(5), fac(10)|
|
2003-02-27 19:08:52 +01:00
|
|
|
fac(1) fac(2) fac(5) fac(10)
|
|
|
|
1 2 120 3628800
|
2003-03-02 19:17:41 +01:00
|
|
|
create function fun(d double, i int, u int unsigned) returns double
|
2003-12-16 18:09:22 +01:00
|
|
|
return mul(inc(i), fac(u)) / e()|
|
|
|
|
select fun(2.3, 3, 5)|
|
2003-03-02 19:17:41 +01:00
|
|
|
fun(2.3, 3, 5)
|
|
|
|
176.58213176229
|
2003-12-16 18:09:22 +01:00
|
|
|
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))|
|
|
|
|
select * from t2 where s = append("a", "b")|
|
2003-03-02 19:17:41 +01:00
|
|
|
s i d
|
|
|
|
ab 24 1324.36598821719
|
2003-12-16 18:09:22 +01:00
|
|
|
select * from t2 where i = mul(4,3) or i = mul(mul(3,4),2)|
|
2003-03-02 19:17:41 +01:00
|
|
|
s i d
|
|
|
|
xxxyyy 12 2.71828182845905
|
|
|
|
ab 24 1324.36598821719
|
2003-12-16 18:09:22 +01:00
|
|
|
select * from t2 where d = e()|
|
2003-03-02 19:17:41 +01:00
|
|
|
s i d
|
|
|
|
xxxyyy 12 2.71828182845905
|
2003-12-16 18:09:22 +01:00
|
|
|
select * from t2|
|
2003-03-02 19:17:41 +01:00
|
|
|
s i d
|
|
|
|
xxxyyy 12 2.71828182845905
|
|
|
|
ab 24 1324.36598821719
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t2|
|
|
|
|
drop function e|
|
|
|
|
drop function inc|
|
|
|
|
drop function mul|
|
|
|
|
drop function append|
|
|
|
|
drop function fun|
|
2003-09-16 14:26:08 +02:00
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call hndlr1(42)|
|
|
|
|
select * from t1|
|
2003-09-16 14:26:08 +02:00
|
|
|
id data
|
|
|
|
hndlr1 42
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure hndlr1|
|
2003-09-16 14:26:08 +02:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call hndlr2(42)|
|
|
|
|
select * from t1|
|
2003-09-16 14:26:08 +02:00
|
|
|
id data
|
|
|
|
hndlr2 1
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure hndlr2|
|
2003-09-16 14:26:08 +02:00
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call hndlr3(3)|
|
|
|
|
select * from t1|
|
2003-09-16 14:26:08 +02:00
|
|
|
id data
|
|
|
|
hndlr3 13
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure hndlr3|
|
|
|
|
drop table if exists t3|
|
|
|
|
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-20 16:59:45 +02:00
|
|
|
select data into val from test.t3 where id='z' limit 1; # No hits
|
|
|
|
insert into test.t3 values ('z', val);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call hndlr4()|
|
|
|
|
select * from t3|
|
2003-10-17 17:13:49 +02:00
|
|
|
id data
|
2003-10-20 16:59:45 +02:00
|
|
|
z NULL
|
2003-12-16 18:09:22 +01:00
|
|
|
drop table t3|
|
|
|
|
drop procedure hndlr4|
|
2003-10-10 16:57:21 +02:00
|
|
|
create procedure cur1()
|
|
|
|
begin
|
|
|
|
declare done int default 0;
|
2003-12-01 18:24:09 +01:00
|
|
|
declare continue handler for sqlstate '02000' set done = 1;
|
2003-10-10 16:57:21 +02:00
|
|
|
declare c cursor for select * from test.t2;
|
|
|
|
declare a char(16);
|
|
|
|
declare b int;
|
|
|
|
declare c double;
|
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
insert into t2 values ("foo", 42, -1.9), ("bar", 3, 12.1), ("zap", 666, -3.14)|
|
|
|
|
call cur1()|
|
|
|
|
select * from t1|
|
2003-10-10 16:57:21 +02:00
|
|
|
id data
|
|
|
|
foo 40
|
|
|
|
bar 15
|
|
|
|
zap 663
|
2003-12-16 18:09:22 +01:00
|
|
|
drop procedure cur1|
|
|
|
|
drop table if exists t3|
|
|
|
|
create table t3 ( s char(16), i int )|
|
2003-10-14 12:59:28 +02:00
|
|
|
create procedure cur2()
|
|
|
|
begin
|
|
|
|
declare done int default 0;
|
2003-12-01 18:24:09 +01:00
|
|
|
declare continue handler for sqlstate '02000' set done = 1;
|
2003-10-14 12:59:28 +02:00
|
|
|
declare c1 cursor for select id,data from test.t1;
|
|
|
|
declare c2 cursor for select i from test.t2;
|
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call cur2()|
|
|
|
|
select * from t3|
|
2003-10-14 12:59:28 +02:00
|
|
|
s i
|
|
|
|
foo 40
|
|
|
|
bar 3
|
|
|
|
zap 663
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure cur2|
|
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
|
|
|
create procedure chistics()
|
|
|
|
language sql
|
|
|
|
not deterministic
|
|
|
|
sql security definer
|
|
|
|
comment 'Characteristics procedure test'
|
2003-12-16 18:09:22 +01:00
|
|
|
insert into t1 values ("chistics", 1)|
|
|
|
|
call chistics()|
|
|
|
|
select * from t1|
|
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
|
|
|
id data
|
|
|
|
chistics 1
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
alter procedure chistics sql security invoker name chistics2|
|
|
|
|
show create procedure chistics2|
|
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
|
|
|
Procedure Create Procedure
|
2003-12-21 11:48:03 +01:00
|
|
|
chistics2 CREATE PROCEDURE `chistics2`()
|
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
|
|
|
SQL SECURITY INVOKER
|
|
|
|
COMMENT 'Characteristics procedure test'
|
|
|
|
insert into t1 values ("chistics", 1)
|
2003-12-16 18:09:22 +01:00
|
|
|
drop procedure chistics2|
|
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
|
|
|
create function chistics() returns int
|
|
|
|
language sql
|
|
|
|
deterministic
|
|
|
|
sql security invoker
|
|
|
|
comment 'Characteristics procedure test'
|
2003-12-16 18:09:22 +01:00
|
|
|
return 42|
|
|
|
|
select chistics()|
|
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
|
|
|
chistics()
|
|
|
|
42
|
2003-12-16 18:09:22 +01:00
|
|
|
alter function chistics name chistics2 comment 'Characteristics function test'|
|
|
|
|
show create function chistics2|
|
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
|
|
|
Function Create Function
|
2003-12-21 11:48:03 +01:00
|
|
|
chistics2 CREATE FUNCTION `chistics2`() RETURNS int
|
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
|
|
|
DETERMINISTIC
|
|
|
|
SQL SECURITY INVOKER
|
|
|
|
COMMENT 'Characteristics function test'
|
|
|
|
return 42
|
2003-12-16 18:09:22 +01:00
|
|
|
drop function chistics2|
|
|
|
|
insert into t1 values ("foo", 1), ("bar", 2), ("zip", 3)|
|
|
|
|
set @@sql_mode = 'ANSI'|
|
2003-12-11 12:23:50 +01:00
|
|
|
create procedure modes(out c1 int, out c2 int)
|
|
|
|
begin
|
|
|
|
declare done int default 0;
|
|
|
|
declare x int;
|
|
|
|
declare continue handler for sqlstate '02000' set done = 1;
|
|
|
|
declare c cursor for select data from t1;
|
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end$
|
|
|
|
set @@sql_mode = ''|
|
|
|
|
set sql_select_limit = 1|
|
|
|
|
call modes(@c1, @c2)|
|
|
|
|
set sql_select_limit = default|
|
|
|
|
select @c1, @c2|
|
2003-12-11 12:23:50 +01:00
|
|
|
@c1 @c2
|
|
|
|
12 3
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure modes|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call bug822('foo', 42)|
|
|
|
|
call bug822('foo', 42)|
|
|
|
|
call bug822('bar', 666)|
|
|
|
|
select * from t1|
|
2003-10-03 12:39:12 +02:00
|
|
|
id data
|
|
|
|
foo 42
|
|
|
|
bar 666
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure bug822|
|
2003-10-14 12:59:28 +02:00
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
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|
|
2003-10-14 12:59:28 +02:00
|
|
|
id data
|
|
|
|
less 2
|
|
|
|
more 17
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure bug1495|
|
2003-10-15 19:03:37 +02:00
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
insert into t1 values ("foo", 12), ("bar", 7)|
|
|
|
|
call bug1547("foo")|
|
|
|
|
call bug1547("bar")|
|
|
|
|
select * from t1|
|
2003-10-15 19:03:37 +02:00
|
|
|
id data
|
|
|
|
foo 12
|
|
|
|
bar 7
|
|
|
|
less 2
|
|
|
|
more 17
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure bug1547|
|
|
|
|
drop table if exists t70|
|
|
|
|
create table t70 (s1 int,s2 int)|
|
|
|
|
insert into t70 values (1,2)|
|
2003-10-28 15:43:49 +01:00
|
|
|
create procedure bug1656(out p1 int, out p2 int)
|
2003-12-16 18:09:22 +01:00
|
|
|
select * into p1, p1 from t70|
|
|
|
|
call bug1656(@1, @2)|
|
|
|
|
select @1, @2|
|
2003-10-28 15:43:49 +01:00
|
|
|
@1 @2
|
|
|
|
2 NULL
|
2003-12-16 18:09:22 +01:00
|
|
|
drop table t70|
|
|
|
|
drop procedure bug1656|
|
|
|
|
drop table if exists t3|
|
|
|
|
create table t3(a 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
|
|
|
create procedure bug1862()
|
|
|
|
begin
|
|
|
|
insert into t3 values(2);
|
|
|
|
flush tables;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call bug1862()|
|
|
|
|
call bug1862()|
|
|
|
|
select * from t3|
|
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
|
|
|
a
|
|
|
|
2
|
|
|
|
2
|
2003-12-16 18:09:22 +01:00
|
|
|
drop table t3|
|
|
|
|
drop procedure bug1862|
|
2003-11-20 18:30:02 +01:00
|
|
|
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);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
insert into t1 (data) values (3), (1), (5), (9), (4)|
|
|
|
|
call bug1874()|
|
|
|
|
select * from t2|
|
2003-11-20 18:30:02 +01:00
|
|
|
s i d
|
|
|
|
max 9 0
|
|
|
|
min 1 0
|
|
|
|
sum 22 0
|
|
|
|
avg 0 4.4
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
|
|
|
drop procedure bug1874|
|
|
|
|
drop table if exists fac|
|
|
|
|
create table fac (n int unsigned not null primary key, f bigint unsigned)|
|
2003-03-03 15:03:19 +01:00
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call ifac(20)|
|
|
|
|
select * from fac|
|
2003-03-03 15:03:19 +01:00
|
|
|
n f
|
|
|
|
1 1
|
|
|
|
2 2
|
|
|
|
3 6
|
|
|
|
4 24
|
|
|
|
5 120
|
|
|
|
6 720
|
|
|
|
7 5040
|
|
|
|
8 40320
|
|
|
|
9 362880
|
|
|
|
10 3628800
|
|
|
|
11 39916800
|
|
|
|
12 479001600
|
|
|
|
13 6227020800
|
|
|
|
14 87178291200
|
|
|
|
15 1307674368000
|
|
|
|
16 20922789888000
|
|
|
|
17 355687428096000
|
|
|
|
18 6402373705728000
|
|
|
|
19 121645100408832000
|
|
|
|
20 2432902008176640000
|
2003-12-16 18:09:22 +01:00
|
|
|
drop table fac|
|
|
|
|
show function status like '%f%'|
|
2003-12-10 19:05:37 +01:00
|
|
|
Name Type Definer Modified Created Security_type Comment
|
2003-12-13 16:40:52 +01:00
|
|
|
fac FUNCTION root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
2003-12-16 18:09:22 +01:00
|
|
|
drop procedure ifac|
|
|
|
|
drop function fac|
|
|
|
|
show function status like '%f%'|
|
2003-12-10 19:05:37 +01:00
|
|
|
Name Type Definer Modified Created Security_type Comment
|
2003-12-16 18:09:22 +01:00
|
|
|
drop table if exists primes|
|
2003-03-06 19:16:46 +01:00
|
|
|
create table primes (
|
|
|
|
i int unsigned not null primary key,
|
|
|
|
p bigint unsigned not null
|
2003-12-16 18:09:22 +01:00
|
|
|
)|
|
2003-03-06 19:16:46 +01:00
|
|
|
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),
|
2003-12-16 18:09:22 +01:00
|
|
|
(40, 181), (41, 191), (42, 193), (43, 197), (44, 199)|
|
2003-03-06 19:16:46 +01:00
|
|
|
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-12-16 18:09:22 +01:00
|
|
|
end|
|
2003-03-06 19:16:46 +01:00
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
show create procedure opp|
|
2003-11-17 18:21:36 +01:00
|
|
|
Procedure Create Procedure
|
2003-12-21 11:48:03 +01:00
|
|
|
opp CREATE PROCEDURE `opp`(n bigint unsigned, out pp bool)
|
2003-11-17 18:21:36 +01:00
|
|
|
begin
|
|
|
|
declare r double;
|
|
|
|
declare b, s bigint unsigned default 0;
|
|
|
|
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;
|
|
|
|
end loop;
|
|
|
|
end
|
2003-12-16 18:09:22 +01:00
|
|
|
show procedure status like '%p%'|
|
2003-12-10 19:05:37 +01:00
|
|
|
Name Type Definer Modified Created Security_type Comment
|
2003-12-13 16:40:52 +01:00
|
|
|
ip PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
|
|
|
opp PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
2003-12-16 18:09:22 +01:00
|
|
|
call ip(200)|
|
|
|
|
select * from primes where i=45 or i=100 or i=199|
|
2003-03-20 11:57:05 +01:00
|
|
|
i p
|
|
|
|
45 211
|
|
|
|
100 557
|
|
|
|
199 1229
|
2003-12-16 18:09:22 +01:00
|
|
|
drop table primes|
|
|
|
|
drop procedure opp|
|
|
|
|
drop procedure ip|
|
|
|
|
show procedure status like '%p%'|
|
2003-12-10 19:05:37 +01:00
|
|
|
Name Type Definer Modified Created Security_type Comment
|
2003-12-16 18:09:22 +01:00
|
|
|
drop table if exists fib|
|
|
|
|
create table fib ( f bigint unsigned not null )|
|
|
|
|
insert into fib values (1), (1)|
|
2003-12-05 18:52:33 +01:00
|
|
|
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;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call fib(20)|
|
|
|
|
select * from fib order by f asc|
|
2003-12-05 18:52:33 +01:00
|
|
|
f
|
|
|
|
1
|
|
|
|
1
|
|
|
|
2
|
|
|
|
3
|
|
|
|
5
|
|
|
|
8
|
|
|
|
13
|
|
|
|
21
|
|
|
|
34
|
|
|
|
55
|
|
|
|
89
|
|
|
|
144
|
|
|
|
233
|
|
|
|
377
|
|
|
|
610
|
|
|
|
987
|
|
|
|
1597
|
|
|
|
2584
|
|
|
|
4181
|
|
|
|
6765
|
|
|
|
10946
|
|
|
|
17711
|
2003-12-16 18:09:22 +01:00
|
|
|
drop table fib|
|
|
|
|
drop procedure fib|
|
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-12-16 18:09:22 +01:00
|
|
|
insert into test.t1 values (x, y)|
|
|
|
|
show procedure status like 'bar'|
|
2003-12-10 19:05:37 +01:00
|
|
|
Name Type Definer Modified Created Security_type Comment
|
2003-12-13 16:40:52 +01:00
|
|
|
bar PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 INVOKER 111111111111
|
2003-12-16 18:09:22 +01:00
|
|
|
alter procedure bar name bar2 comment "2222222222" sql security definer|
|
|
|
|
alter procedure bar2 name bar comment "3333333333"|
|
|
|
|
alter procedure bar|
|
|
|
|
show create procedure bar|
|
2003-11-17 18:21:36 +01:00
|
|
|
Procedure Create Procedure
|
2003-12-21 11:48:03 +01:00
|
|
|
bar CREATE PROCEDURE `bar`(x char(16), y int)
|
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
|
|
|
COMMENT '3333333333'
|
2003-11-17 18:21:36 +01:00
|
|
|
insert into test.t1 values (x, y)
|
2003-12-16 18:09:22 +01:00
|
|
|
show procedure status like 'bar'|
|
2003-12-10 19:05:37 +01:00
|
|
|
Name Type Definer Modified Created Security_type Comment
|
2003-12-13 16:40:52 +01:00
|
|
|
bar PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER 3333333333
|
2003-12-16 18:09:22 +01:00
|
|
|
drop procedure bar|
|
2003-01-17 14:38:05 +01:00
|
|
|
drop table t1;
|
2003-03-02 19:17:41 +01:00
|
|
|
drop table t2;
|