2003-01-17 14:38:05 +01:00
|
|
|
use test;
|
2005-07-30 10:19:57 +02:00
|
|
|
drop table if exists t1,t2,t3,t4;
|
2003-01-17 14:38:05 +01:00
|
|
|
create table t1 (
|
2005-01-15 02:09:35 +01:00
|
|
|
id char(16) not null default '',
|
2003-01-17 14:38:05 +01:00
|
|
|
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
|
|
|
);
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists foo42;
|
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;
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bar;
|
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;
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists 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 empty()
|
|
|
|
begin
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
call empty()|
|
|
|
|
drop procedure empty|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists scope|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists two|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists locset|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists setcontext|
|
2004-01-14 12:47:03 +01:00
|
|
|
create procedure setcontext()
|
|
|
|
begin
|
|
|
|
declare data int default 2;
|
|
|
|
insert into t1 (id, data) values ("foo", 1);
|
|
|
|
replace t1 set data = data, id = "bar";
|
|
|
|
update t1 set id = "kaka", data = 3 where t1.data = data;
|
|
|
|
end|
|
|
|
|
call setcontext()|
|
|
|
|
select * from t1|
|
|
|
|
id data
|
|
|
|
foo 1
|
|
|
|
kaka 3
|
|
|
|
delete from t1|
|
|
|
|
drop procedure setcontext|
|
2003-12-16 18:09:22 +01:00
|
|
|
create table t3 ( d date, i int, f double, s varchar(32) )|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists nullset|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists mixset|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists zip|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists zap|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists c1|
|
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)|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists c2|
|
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)|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists c3|
|
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)|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists c4|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists iotest|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists inc2|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists inc|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists incr|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists cbv1|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists cbv2|
|
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)|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists sub1|
|
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)|
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
drop procedure if exists sub2|
|
|
|
|
create procedure sub2(id char(16))
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
set x = (select sum(t.i) from test.t2 t);
|
|
|
|
insert into test.t1 values (id, x);
|
|
|
|
end|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists sub3|
|
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))|
|
2005-12-07 15:01:17 +01:00
|
|
|
ERROR 21000: Operand should contain 1 column(s)
|
2003-12-16 18:09:22 +01:00
|
|
|
call sub1("sub1d", (select 1 from (select 1) a))|
|
2005-06-10 16:14:01 +02:00
|
|
|
call sub2("sub2")|
|
2003-12-16 18:09:22 +01:00
|
|
|
select * from t1|
|
2003-04-27 17:35:54 +02:00
|
|
|
id data
|
|
|
|
sub1a 7
|
|
|
|
sub1b 3
|
|
|
|
sub1d 1
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
sub2 6
|
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|
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
drop procedure sub2|
|
2003-12-16 18:09:22 +01:00
|
|
|
drop function sub3|
|
2005-06-10 16:14:01 +02:00
|
|
|
delete from t1|
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t2|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists a0|
|
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
|
|
|
|
a0 2
|
|
|
|
a0 1
|
|
|
|
a0 0
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure a0|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists a|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists b|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists b2|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists c|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists d|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists e|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists f|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists g|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists h|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists i|
|
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)|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists sel1|
|
2003-12-16 18:09:22 +01:00
|
|
|
create procedure sel1()
|
|
|
|
begin
|
|
|
|
select * from t1;
|
|
|
|
end|
|
|
|
|
call sel1()|
|
|
|
|
id data
|
|
|
|
foo 3
|
|
|
|
bar 19
|
|
|
|
drop procedure sel1|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists sel2|
|
2003-12-16 18:09:22 +01:00
|
|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists into_test|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists into_tes2|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists 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_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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists 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
|
|
|
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|
|
|
|
|
create table t3 ( s char(16), d int)|
|
|
|
|
call into_test4()|
|
2005-04-22 12:53:48 +02:00
|
|
|
Warnings:
|
2006-01-17 19:10:47 +01:00
|
|
|
Warning 1329 No data - zero rows fetched, selected, or processed
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists into_outfile|
|
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);
|
2006-02-16 22:10:25 +01:00
|
|
|
select * into outfile "../tmp/spout" from test.t1;
|
2003-02-19 12:42:32 +01:00
|
|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists into_dumpfile|
|
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);
|
2006-02-16 22:10:25 +01:00
|
|
|
select * into dumpfile "../tmp/spdump" from test.t1 limit 1;
|
2003-02-19 12:42:32 +01:00
|
|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists create_select|
|
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);
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
create temporary table test.t3 select * from test.t1;
|
2003-04-04 15:47:43 +02:00
|
|
|
insert into test.t3 values (concat(x, "2"), y+2);
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
|
|
|
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
|
Prelocking-free SPs, post-review fixes:
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
mysql-test/r/sp-prelocking.result:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
Don't drop the table we're not using.
mysql-test/r/sp.result:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
Don't drop the table we're not using.
mysql-test/t/sp.test:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
sql/sp.cc:
New, better defined, sp_get_prelocking_info() function to get info about
statement prelocking options
sql/sp.h:
Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info()
function to get info about statement prelocking options
sql/sp_cache.h:
Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that
attaches removes statement's prelocking tables.
sql/sql_base.cc:
Prelocking-free SPs, post-review fixes:
* Use a better defined sp_get_prelocking_info() function to get info about
statement prelocking options
* Don't activate prelocked mode for evaluation of SP arguments that use tables
but don't need prelocking.
sql/sql_class.cc:
Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.
2005-08-03 05:37:32 +02:00
|
|
|
drop table t3|
|
2003-12-16 18:09:22 +01:00
|
|
|
delete from t1|
|
|
|
|
drop procedure create_select|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop function if exists e|
|
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
|
2004-12-28 16:58:14 +01:00
|
|
|
drop function if exists inc|
|
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
|
2004-12-28 16:58:14 +01:00
|
|
|
drop function if exists mul|
|
2003-02-26 19:22:29 +01:00
|
|
|
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
|
2004-12-28 16:58:14 +01:00
|
|
|
drop function if exists append|
|
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
|
2004-12-28 16:58:14 +01:00
|
|
|
drop function if exists fac|
|
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
|
2004-12-28 16:58:14 +01:00
|
|
|
drop function if exists fun|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists hndlr1|
|
2003-09-16 14:26:08 +02:00
|
|
|
create procedure hndlr1(val int)
|
|
|
|
begin
|
|
|
|
declare x int default 0;
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
declare foo condition for 1136;
|
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;
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
insert into test.t1 values ("hndlr1", val, 2); # Too many values
|
2003-09-16 14:26:08 +02:00
|
|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists hndlr2|
|
2003-09-16 14:26:08 +02:00
|
|
|
create procedure hndlr2(val int)
|
|
|
|
begin
|
|
|
|
declare x int default 0;
|
|
|
|
begin
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
declare exit handler for sqlstate '21S01' set x = 1;
|
|
|
|
insert into test.t1 values ("hndlr2", val, 2); # Too many values
|
2003-09-16 14:26:08 +02:00
|
|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists hndlr3|
|
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;
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
insert into test.t1 values ("hndlr3", y, 2); # Too many values
|
2003-09-16 14:26:08 +02:00
|
|
|
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|
|
|
|
|
create table t3 ( id char(16), data int )|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists hndlr4|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists cur1|
|
2003-10-10 16:57:21 +02:00
|
|
|
create procedure cur1()
|
|
|
|
begin
|
|
|
|
declare a char(16);
|
|
|
|
declare b int;
|
|
|
|
declare c double;
|
2004-03-29 11:16:45 +02:00
|
|
|
declare done int default 0;
|
|
|
|
declare c cursor for select * from test.t2;
|
|
|
|
declare continue handler for sqlstate '02000' set done = 1;
|
2003-10-10 16:57:21 +02:00
|
|
|
open c;
|
|
|
|
repeat
|
|
|
|
fetch c into a, b, c;
|
|
|
|
if not done then
|
|
|
|
insert into test.t1 values (a, b+c);
|
|
|
|
end if;
|
|
|
|
until done end repeat;
|
|
|
|
close c;
|
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|
|
|
|
|
create table t3 ( s char(16), i int )|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists cur2|
|
2003-10-14 12:59:28 +02:00
|
|
|
create procedure cur2()
|
|
|
|
begin
|
|
|
|
declare done int default 0;
|
|
|
|
declare c1 cursor for select id,data from test.t1;
|
|
|
|
declare c2 cursor for select i from test.t2;
|
2004-03-29 11:16:45 +02:00
|
|
|
declare continue handler for sqlstate '02000' set done = 1;
|
2003-10-14 12:59:28 +02:00
|
|
|
open c1;
|
|
|
|
open c2;
|
|
|
|
repeat
|
|
|
|
begin
|
|
|
|
declare a char(16);
|
|
|
|
declare b,c int;
|
2004-11-03 13:49:54 +01:00
|
|
|
fetch from c1 into a, b;
|
|
|
|
fetch next from c2 into c;
|
2003-10-14 12:59:28 +02:00
|
|
|
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|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists 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
|
|
|
create procedure chistics()
|
|
|
|
language sql
|
2004-10-14 18:07:09 +02:00
|
|
|
modifies sql data
|
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
|
|
|
not deterministic
|
|
|
|
sql security definer
|
|
|
|
comment 'Characteristics procedure test'
|
2004-10-14 18:07:09 +02:00
|
|
|
insert into t1 values ("chistics", 1)|
|
|
|
|
show create procedure chistics|
|
|
|
|
Procedure sql_mode Create Procedure
|
2006-03-02 13:18:49 +01:00
|
|
|
chistics CREATE DEFINER=`root`@`localhost` PROCEDURE `chistics`()
|
2004-10-14 18:07:09 +02:00
|
|
|
MODIFIES SQL DATA
|
|
|
|
COMMENT 'Characteristics procedure test'
|
|
|
|
insert into t1 values ("chistics", 1)
|
2003-12-16 18:09:22 +01:00
|
|
|
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|
|
Fixed BUG#6027: Stored procedures can be renamed.
Removed the support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
mysql-test/r/sp-error.result:
Removed test for renaming procedures with alter.
mysql-test/r/sp.result:
Removed test for renaming procedures with alter.
mysql-test/t/sp-error.test:
Removed test for renaming procedures with alter.
mysql-test/t/sp.test:
Removed test for renaming procedures with alter.
sql/sp.cc:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sp.h:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sql_parse.cc:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sql_yacc.yy:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
2004-10-22 19:05:17 +02:00
|
|
|
alter procedure chistics sql security invoker|
|
|
|
|
show create procedure chistics|
|
2004-06-09 14:19:43 +02:00
|
|
|
Procedure sql_mode Create Procedure
|
2006-03-02 13:18:49 +01:00
|
|
|
chistics CREATE DEFINER=`root`@`localhost` PROCEDURE `chistics`()
|
2004-10-14 18:07:09 +02:00
|
|
|
MODIFIES SQL DATA
|
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)
|
Fixed BUG#6027: Stored procedures can be renamed.
Removed the support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
mysql-test/r/sp-error.result:
Removed test for renaming procedures with alter.
mysql-test/r/sp.result:
Removed test for renaming procedures with alter.
mysql-test/t/sp-error.test:
Removed test for renaming procedures with alter.
mysql-test/t/sp.test:
Removed test for renaming procedures with alter.
sql/sp.cc:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sp.h:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sql_parse.cc:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sql_yacc.yy:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
2004-10-22 19:05:17 +02:00
|
|
|
drop procedure chistics|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop function if exists 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
|
|
|
create function chistics() returns int
|
|
|
|
language sql
|
|
|
|
deterministic
|
|
|
|
sql security invoker
|
|
|
|
comment 'Characteristics procedure test'
|
2004-10-14 18:07:09 +02:00
|
|
|
return 42|
|
|
|
|
show create function chistics|
|
|
|
|
Function sql_mode Create Function
|
2006-03-02 13:18:49 +01:00
|
|
|
chistics CREATE DEFINER=`root`@`localhost` FUNCTION `chistics`() RETURNS int(11)
|
2004-10-14 18:07:09 +02:00
|
|
|
DETERMINISTIC
|
|
|
|
SQL SECURITY INVOKER
|
|
|
|
COMMENT 'Characteristics procedure test'
|
|
|
|
return 42
|
2003-12-16 18:09:22 +01:00
|
|
|
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
|
Fixed BUG#6027: Stored procedures can be renamed.
Removed the support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
mysql-test/r/sp-error.result:
Removed test for renaming procedures with alter.
mysql-test/r/sp.result:
Removed test for renaming procedures with alter.
mysql-test/t/sp-error.test:
Removed test for renaming procedures with alter.
mysql-test/t/sp.test:
Removed test for renaming procedures with alter.
sql/sp.cc:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sp.h:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sql_parse.cc:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sql_yacc.yy:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
2004-10-22 19:05:17 +02:00
|
|
|
alter function chistics
|
2004-10-14 18:07:09 +02:00
|
|
|
no sql
|
|
|
|
comment 'Characteristics function test'|
|
Fixed BUG#6027: Stored procedures can be renamed.
Removed the support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
mysql-test/r/sp-error.result:
Removed test for renaming procedures with alter.
mysql-test/r/sp.result:
Removed test for renaming procedures with alter.
mysql-test/t/sp-error.test:
Removed test for renaming procedures with alter.
mysql-test/t/sp.test:
Removed test for renaming procedures with alter.
sql/sp.cc:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sp.h:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sql_parse.cc:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sql_yacc.yy:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
2004-10-22 19:05:17 +02:00
|
|
|
show create function chistics|
|
2004-06-09 14:19:43 +02:00
|
|
|
Function sql_mode Create Function
|
2006-03-02 13:18:49 +01:00
|
|
|
chistics CREATE DEFINER=`root`@`localhost` FUNCTION `chistics`() RETURNS int(11)
|
2004-10-14 18:07:09 +02:00
|
|
|
NO SQL
|
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
|
Fixed BUG#6027: Stored procedures can be renamed.
Removed the support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
mysql-test/r/sp-error.result:
Removed test for renaming procedures with alter.
mysql-test/r/sp.result:
Removed test for renaming procedures with alter.
mysql-test/t/sp-error.test:
Removed test for renaming procedures with alter.
mysql-test/t/sp.test:
Removed test for renaming procedures with alter.
sql/sp.cc:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sp.h:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sql_parse.cc:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
sql/sql_yacc.yy:
Removed support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.
2004-10-22 19:05:17 +02:00
|
|
|
drop function chistics|
|
2003-12-16 18:09:22 +01:00
|
|
|
insert into t1 values ("foo", 1), ("bar", 2), ("zip", 3)|
|
|
|
|
set @@sql_mode = 'ANSI'|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists modes$
|
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 c cursor for select data from t1;
|
2004-03-29 11:16:45 +02:00
|
|
|
declare continue handler for sqlstate '02000' set done = 1;
|
2003-12-11 12:23:50 +01:00
|
|
|
select 1 || 2 into c1;
|
|
|
|
set c2 = 0;
|
|
|
|
open c;
|
|
|
|
repeat
|
|
|
|
fetch c into x;
|
|
|
|
if not done then
|
|
|
|
set c2 = c2 + 1;
|
|
|
|
end if;
|
|
|
|
until done end repeat;
|
|
|
|
close c;
|
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|
|
2004-03-22 14:44:41 +01:00
|
|
|
create database sp_db1|
|
|
|
|
drop database sp_db1|
|
|
|
|
create database sp_db2|
|
|
|
|
use sp_db2|
|
|
|
|
create table t3 ( s char(4), t int )|
|
|
|
|
insert into t3 values ("abcd", 42), ("dcba", 666)|
|
|
|
|
use test|
|
|
|
|
drop database sp_db2|
|
|
|
|
create database sp_db3|
|
|
|
|
use sp_db3|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists dummy|
|
2004-03-22 14:44:41 +01:00
|
|
|
create procedure dummy(out x int)
|
|
|
|
set x = 42|
|
|
|
|
use test|
|
|
|
|
drop database sp_db3|
|
|
|
|
select type,db,name from mysql.proc where db = 'sp_db3'|
|
|
|
|
type db name
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists rc|
|
2004-05-04 13:45:20 +02:00
|
|
|
create procedure rc()
|
|
|
|
begin
|
|
|
|
delete from t1;
|
|
|
|
insert into t1 values ("a", 1), ("b", 2), ("c", 3);
|
|
|
|
end|
|
|
|
|
call rc()|
|
|
|
|
select row_count()|
|
|
|
|
row_count()
|
|
|
|
3
|
|
|
|
update t1 set data=42 where id = "b";
|
|
|
|
select row_count()|
|
|
|
|
row_count()
|
|
|
|
1
|
|
|
|
delete from t1|
|
|
|
|
select row_count()|
|
|
|
|
row_count()
|
|
|
|
3
|
|
|
|
delete from t1|
|
|
|
|
select row_count()|
|
|
|
|
row_count()
|
|
|
|
0
|
2004-05-04 17:18:47 +02:00
|
|
|
select * from t1|
|
|
|
|
id data
|
|
|
|
select row_count()|
|
|
|
|
row_count()
|
|
|
|
-1
|
2004-05-04 13:45:20 +02:00
|
|
|
drop procedure rc|
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
drop function if exists f0|
|
|
|
|
drop function if exists f1|
|
|
|
|
drop function if exists f2|
|
|
|
|
drop function if exists f3|
|
|
|
|
drop function if exists f4|
|
|
|
|
drop function if exists f5|
|
|
|
|
drop function if exists f6|
|
|
|
|
drop function if exists f7|
|
|
|
|
drop function if exists f8|
|
2006-01-12 23:51:56 +01:00
|
|
|
drop function if exists f9|
|
|
|
|
drop function if exists f10|
|
|
|
|
drop function if exists f11|
|
|
|
|
drop function if exists f12_1|
|
|
|
|
drop function if exists f12_2|
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
drop view if exists v0|
|
|
|
|
drop view if exists v1|
|
|
|
|
drop view if exists v2|
|
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
|
|
|
insert into t1 values ("a", 1), ("b", 2) |
|
|
|
|
insert into t2 values ("a", 1, 1.0), ("b", 2, 2.0), ("c", 3, 3.0) |
|
|
|
|
create function f1() returns int
|
|
|
|
return (select sum(data) from t1)|
|
|
|
|
select f1()|
|
|
|
|
f1()
|
|
|
|
3
|
|
|
|
select id, f1() from t1|
|
|
|
|
id f1()
|
|
|
|
a 3
|
|
|
|
b 3
|
|
|
|
create function f2() returns int
|
|
|
|
return (select data from t1 where data <= (select sum(data) from t1) limit 1)|
|
|
|
|
select f2()|
|
|
|
|
f2()
|
|
|
|
1
|
|
|
|
select id, f2() from t1|
|
|
|
|
id f2()
|
|
|
|
a 1
|
|
|
|
b 1
|
|
|
|
create function f3() returns int
|
|
|
|
begin
|
|
|
|
declare n int;
|
|
|
|
declare m int;
|
|
|
|
set n:= (select min(data) from t1);
|
|
|
|
set m:= (select max(data) from t1);
|
|
|
|
return n < m;
|
|
|
|
end|
|
|
|
|
select f3()|
|
|
|
|
f3()
|
|
|
|
1
|
|
|
|
select id, f3() from t1|
|
|
|
|
id f3()
|
|
|
|
a 1
|
|
|
|
b 1
|
|
|
|
select f1(), f3()|
|
|
|
|
f1() f3()
|
|
|
|
3 1
|
|
|
|
select id, f1(), f3() from t1|
|
|
|
|
id f1() f3()
|
|
|
|
a 3 1
|
|
|
|
b 3 1
|
|
|
|
create function f4() returns double
|
|
|
|
return (select d from t1, t2 where t1.data = t2.i and t1.id= "b")|
|
|
|
|
select f4()|
|
|
|
|
f4()
|
|
|
|
2
|
|
|
|
select s, f4() from t2|
|
|
|
|
s f4()
|
|
|
|
a 2
|
|
|
|
b 2
|
|
|
|
c 2
|
|
|
|
create function f5(i int) returns int
|
|
|
|
begin
|
|
|
|
if i <= 0 then
|
|
|
|
return 0;
|
|
|
|
elseif i = 1 then
|
|
|
|
return (select count(*) from t1 where data = i);
|
|
|
|
else
|
|
|
|
return (select count(*) + f5( i - 1) from t1 where data = i);
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
select f5(1)|
|
|
|
|
f5(1)
|
|
|
|
1
|
2005-11-26 17:15:17 +01:00
|
|
|
select f5(2)|
|
|
|
|
ERROR HY000: Recursive stored functions and triggers are not allowed.
|
|
|
|
select f5(3)|
|
|
|
|
ERROR HY000: Recursive stored functions and triggers are not allowed.
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
create function f6() returns int
|
|
|
|
begin
|
|
|
|
declare n int;
|
|
|
|
set n:= f1();
|
|
|
|
return (select count(*) from t1 where data <= f7() and data <= n);
|
|
|
|
end|
|
|
|
|
create function f7() returns int
|
|
|
|
return (select sum(data) from t1 where data <= f1())|
|
|
|
|
select f6()|
|
|
|
|
f6()
|
|
|
|
2
|
|
|
|
select id, f6() from t1|
|
|
|
|
id f6()
|
|
|
|
a 2
|
|
|
|
b 2
|
|
|
|
create view v1 (a) as select f1()|
|
|
|
|
select * from v1|
|
|
|
|
a
|
|
|
|
3
|
|
|
|
select id, a from t1, v1|
|
|
|
|
id a
|
|
|
|
a 3
|
|
|
|
b 3
|
|
|
|
select * from v1, v1 as v|
|
|
|
|
a a
|
|
|
|
3 3
|
|
|
|
create view v2 (a) as select a*10 from v1|
|
|
|
|
select * from v2|
|
|
|
|
a
|
|
|
|
30
|
|
|
|
select id, a from t1, v2|
|
|
|
|
id a
|
|
|
|
a 30
|
|
|
|
b 30
|
|
|
|
select * from v1, v2|
|
|
|
|
a a
|
|
|
|
3 30
|
|
|
|
create function f8 () returns int
|
|
|
|
return (select count(*) from v2)|
|
|
|
|
select *, f8() from v1|
|
|
|
|
a f8()
|
|
|
|
3 1
|
|
|
|
drop function f1|
|
|
|
|
select * from v1|
|
2005-10-27 23:18:23 +02:00
|
|
|
ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
create function f1() returns int
|
|
|
|
return (select sum(data) from t1) + (select sum(data) from v1)|
|
2005-11-26 17:15:17 +01:00
|
|
|
select f1()|
|
|
|
|
ERROR HY000: Recursive stored functions and triggers are not allowed.
|
|
|
|
select * from v1|
|
|
|
|
ERROR HY000: Recursive stored functions and triggers are not allowed.
|
|
|
|
select * from v2|
|
|
|
|
ERROR HY000: Recursive stored functions and triggers are not allowed.
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
drop function f1|
|
|
|
|
create function f1() returns int
|
|
|
|
return (select sum(data) from t1)|
|
|
|
|
create function f0() returns int
|
|
|
|
return (select * from (select 100) as r)|
|
|
|
|
select f0()|
|
|
|
|
f0()
|
|
|
|
100
|
|
|
|
select *, f0() from (select 1) as t|
|
|
|
|
1 f0()
|
|
|
|
1 100
|
|
|
|
create view v0 as select f0()|
|
|
|
|
select * from v0|
|
|
|
|
f0()
|
|
|
|
100
|
|
|
|
select *, f0() from v0|
|
|
|
|
f0() f0()
|
|
|
|
100 100
|
2005-11-26 17:15:17 +01:00
|
|
|
lock tables t1 read, t1 as t11 read|
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
select f3()|
|
|
|
|
f3()
|
|
|
|
1
|
|
|
|
select id, f3() from t1 as t11|
|
|
|
|
id f3()
|
|
|
|
a 1
|
|
|
|
b 1
|
|
|
|
select f0()|
|
|
|
|
f0()
|
|
|
|
100
|
|
|
|
select * from v0|
|
|
|
|
f0()
|
|
|
|
100
|
|
|
|
select *, f0() from v0, (select 123) as d1|
|
|
|
|
f0() 123 f0()
|
|
|
|
100 123 100
|
|
|
|
select id, f3() from t1|
|
|
|
|
ERROR HY000: Table 't1' was not locked with LOCK TABLES
|
|
|
|
select f4()|
|
|
|
|
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
|
|
|
unlock tables|
|
|
|
|
lock tables v2 read, mysql.proc read|
|
|
|
|
select * from v2|
|
|
|
|
a
|
|
|
|
30
|
|
|
|
select * from v1|
|
|
|
|
a
|
|
|
|
3
|
2005-07-09 19:51:59 +02:00
|
|
|
select * from v1, t1|
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
ERROR HY000: Table 't1' was not locked with LOCK TABLES
|
|
|
|
select f4()|
|
|
|
|
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
|
|
|
unlock tables|
|
2006-01-12 23:51:56 +01:00
|
|
|
create function f9() returns int
|
|
|
|
begin
|
|
|
|
declare a, b int;
|
|
|
|
drop temporary table if exists t3;
|
|
|
|
create temporary table t3 (id int);
|
|
|
|
insert into t3 values (1), (2), (3);
|
|
|
|
set a:= (select count(*) from t3);
|
|
|
|
set b:= (select count(*) from t3 t3_alias);
|
|
|
|
return a + b;
|
|
|
|
end|
|
|
|
|
select f9()|
|
|
|
|
f9()
|
|
|
|
6
|
|
|
|
Warnings:
|
|
|
|
Note 1051 Unknown table 't3'
|
|
|
|
select f9() from t1 limit 1|
|
|
|
|
f9()
|
|
|
|
6
|
|
|
|
create function f10() returns int
|
|
|
|
begin
|
|
|
|
drop temporary table if exists t3;
|
|
|
|
create temporary table t3 (id int);
|
|
|
|
insert into t3 select id from t4;
|
|
|
|
return (select count(*) from t3);
|
|
|
|
end|
|
|
|
|
select f10()|
|
|
|
|
ERROR 42S02: Table 'test.t4' doesn't exist
|
|
|
|
create table t4 as select 1 as id|
|
|
|
|
select f10()|
|
|
|
|
f10()
|
|
|
|
1
|
|
|
|
create function f11() returns int
|
|
|
|
begin
|
|
|
|
drop temporary table if exists t3;
|
|
|
|
create temporary table t3 (id int);
|
|
|
|
insert into t3 values (1), (2), (3);
|
|
|
|
return (select count(*) from t3 as a, t3 as b);
|
|
|
|
end|
|
|
|
|
select f11()|
|
|
|
|
ERROR HY000: Can't reopen table: 'a'
|
|
|
|
select f11() from t1|
|
|
|
|
ERROR HY000: Can't reopen table: 'a'
|
|
|
|
create function f12_1() returns int
|
|
|
|
begin
|
|
|
|
drop temporary table if exists t3;
|
|
|
|
create temporary table t3 (id int);
|
|
|
|
insert into t3 values (1), (2), (3);
|
|
|
|
return f12_2();
|
|
|
|
end|
|
|
|
|
create function f12_2() returns int
|
|
|
|
return (select count(*) from t3)|
|
|
|
|
drop temporary table t3|
|
|
|
|
select f12_1()|
|
|
|
|
ERROR 42S02: Table 'test.t3' doesn't exist
|
|
|
|
select f12_1() from t1 limit 1|
|
|
|
|
ERROR 42S02: Table 'test.t3' doesn't exist
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
drop function f0|
|
|
|
|
drop function f1|
|
|
|
|
drop function f2|
|
|
|
|
drop function f3|
|
|
|
|
drop function f4|
|
|
|
|
drop function f5|
|
|
|
|
drop function f6|
|
|
|
|
drop function f7|
|
|
|
|
drop function f8|
|
2006-01-12 23:51:56 +01:00
|
|
|
drop function f9|
|
|
|
|
drop function f10|
|
|
|
|
drop function f11|
|
|
|
|
drop function f12_1|
|
|
|
|
drop function f12_2|
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
drop view v0|
|
|
|
|
drop view v1|
|
|
|
|
drop view v2|
|
|
|
|
delete from t1 |
|
|
|
|
delete from t2 |
|
2006-01-12 23:51:56 +01:00
|
|
|
drop table t4|
|
2006-01-19 17:55:54 +01:00
|
|
|
drop table if exists t3|
|
|
|
|
create table t3 (n int unsigned not null primary key, f bigint unsigned)|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop procedure if exists ifac|
|
|
|
|
create procedure ifac(n int unsigned)
|
2003-10-03 12:39:12 +02:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare i int unsigned default 1;
|
|
|
|
if n > 20 then
|
|
|
|
set n = 20; # bigint overflow otherwise
|
2003-10-03 12:39:12 +02:00
|
|
|
end if;
|
2005-03-07 17:16:37 +01:00
|
|
|
while i <= n do
|
2003-10-14 12:59:28 +02:00
|
|
|
begin
|
2006-01-19 17:55:54 +01:00
|
|
|
insert into test.t3 values (i, fac(i));
|
2005-03-07 17:16:37 +01:00
|
|
|
set i = i + 1;
|
|
|
|
end;
|
|
|
|
end while;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
call ifac(20)|
|
2006-01-19 17:55:54 +01:00
|
|
|
select * from t3|
|
2005-03-07 17:16:37 +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
|
2006-01-19 17:55:54 +01:00
|
|
|
drop table t3|
|
2005-03-07 17:16:37 +01:00
|
|
|
show function status like '%f%'|
|
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
|
|
|
test fac FUNCTION root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
|
|
|
drop procedure ifac|
|
|
|
|
drop function fac|
|
|
|
|
show function status like '%f%'|
|
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
2006-01-19 17:55:54 +01:00
|
|
|
drop table if exists t3|
|
|
|
|
create table t3 (
|
2005-03-07 17:16:37 +01:00
|
|
|
i int unsigned not null primary key,
|
|
|
|
p bigint unsigned not null
|
|
|
|
)|
|
2006-01-19 17:55:54 +01:00
|
|
|
insert into t3 values
|
2005-03-07 17:16:37 +01:00
|
|
|
( 0, 3), ( 1, 5), ( 2, 7), ( 3, 11), ( 4, 13),
|
|
|
|
( 5, 17), ( 6, 19), ( 7, 23), ( 8, 29), ( 9, 31),
|
|
|
|
(10, 37), (11, 41), (12, 43), (13, 47), (14, 53),
|
|
|
|
(15, 59), (16, 61), (17, 67), (18, 71), (19, 73),
|
|
|
|
(20, 79), (21, 83), (22, 89), (23, 97), (24, 101),
|
|
|
|
(25, 103), (26, 107), (27, 109), (28, 113), (29, 127),
|
|
|
|
(30, 131), (31, 137), (32, 139), (33, 149), (34, 151),
|
|
|
|
(35, 157), (36, 163), (37, 167), (38, 173), (39, 179),
|
|
|
|
(40, 181), (41, 191), (42, 193), (43, 197), (44, 199)|
|
|
|
|
drop procedure if exists opp|
|
|
|
|
create procedure opp(n bigint unsigned, out pp bool)
|
2003-10-15 19:03:37 +02:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
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;
|
2003-10-15 19:03:37 +02:00
|
|
|
else
|
2005-03-07 17:16:37 +01:00
|
|
|
begin
|
|
|
|
declare p bigint unsigned;
|
2006-01-19 17:55:54 +01:00
|
|
|
select t.p into p from test.t3 t where t.i = s;
|
2005-03-07 17:16:37 +01:00
|
|
|
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;
|
2003-10-15 19:03:37 +02:00
|
|
|
end if;
|
2005-03-07 17:16:37 +01:00
|
|
|
end loop;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop procedure if exists ip|
|
|
|
|
create procedure ip(m int unsigned)
|
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
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare p bigint unsigned;
|
|
|
|
declare i int unsigned;
|
|
|
|
set i=45, p=201;
|
|
|
|
while i < m do
|
2003-11-20 18:30:02 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare pp bool default 0;
|
|
|
|
call opp(p, pp);
|
|
|
|
if pp then
|
2006-01-19 17:55:54 +01:00
|
|
|
insert into test.t3 values (i, p);
|
2005-03-07 17:16:37 +01:00
|
|
|
set i = i+1;
|
|
|
|
end if;
|
|
|
|
set p = p+2;
|
|
|
|
end;
|
|
|
|
end while;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
show create procedure opp|
|
|
|
|
Procedure sql_mode Create Procedure
|
2006-03-02 13:18:49 +01:00
|
|
|
opp CREATE DEFINER=`root`@`localhost` PROCEDURE `opp`(n bigint unsigned, out pp bool)
|
2004-01-08 10:55:10 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
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
|
2004-01-21 14:28:35 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare p bigint unsigned;
|
2006-01-19 17:55:54 +01:00
|
|
|
select t.p into p from test.t3 t where t.i = s;
|
2005-03-07 17:16:37 +01:00
|
|
|
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
|
|
|
|
show procedure status like '%p%'|
|
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
|
|
|
test ip PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
|
|
|
test opp PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
|
|
|
call ip(200)|
|
2006-01-19 17:55:54 +01:00
|
|
|
select * from t3 where i=45 or i=100 or i=199|
|
2005-03-07 17:16:37 +01:00
|
|
|
i p
|
|
|
|
45 211
|
|
|
|
100 557
|
|
|
|
199 1229
|
2006-01-19 17:55:54 +01:00
|
|
|
drop table t3|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop procedure opp|
|
|
|
|
drop procedure ip|
|
|
|
|
show procedure status like '%p%'|
|
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
2006-01-19 17:55:54 +01:00
|
|
|
drop table if exists t3|
|
|
|
|
create table t3 ( f bigint unsigned not null )|
|
2005-11-26 17:15:17 +01:00
|
|
|
drop procedure if exists fib|
|
|
|
|
create procedure fib(n int unsigned)
|
|
|
|
begin
|
|
|
|
if n > 1 then
|
|
|
|
begin
|
|
|
|
declare x, y bigint unsigned;
|
2006-01-19 17:55:54 +01:00
|
|
|
declare c cursor for select f from t3 order by f desc limit 2;
|
2005-11-26 17:15:17 +01:00
|
|
|
open c;
|
|
|
|
fetch c into y;
|
|
|
|
fetch c into x;
|
|
|
|
close c;
|
2006-01-19 17:55:54 +01:00
|
|
|
insert into t3 values (x+y);
|
2005-11-26 17:15:17 +01:00
|
|
|
call fib(n-1);
|
|
|
|
end;
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
set @@max_sp_recursion_depth= 20|
|
2006-01-19 17:55:54 +01:00
|
|
|
insert into t3 values (0), (1)|
|
2005-11-26 17:15:17 +01:00
|
|
|
call fib(3)|
|
2006-01-19 17:55:54 +01:00
|
|
|
select * from t3 order by f asc|
|
2005-11-26 17:15:17 +01:00
|
|
|
f
|
|
|
|
0
|
|
|
|
1
|
|
|
|
1
|
|
|
|
2
|
2006-01-19 17:55:54 +01:00
|
|
|
delete from t3|
|
|
|
|
insert into t3 values (0), (1)|
|
2006-01-20 08:32:22 +01:00
|
|
|
call fib(10)|
|
2006-01-19 17:55:54 +01:00
|
|
|
select * from t3 order by f asc|
|
2005-11-26 17:15:17 +01:00
|
|
|
f
|
|
|
|
0
|
|
|
|
1
|
|
|
|
1
|
|
|
|
2
|
|
|
|
3
|
|
|
|
5
|
|
|
|
8
|
|
|
|
13
|
|
|
|
21
|
|
|
|
34
|
|
|
|
55
|
2006-01-19 17:55:54 +01:00
|
|
|
drop table t3|
|
2005-11-26 17:15:17 +01:00
|
|
|
drop procedure fib|
|
|
|
|
set @@max_sp_recursion_depth= 0|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop procedure if exists bar|
|
|
|
|
create procedure bar(x char(16), y int)
|
|
|
|
comment "111111111111" sql security invoker
|
|
|
|
insert into test.t1 values (x, y)|
|
|
|
|
show procedure status like 'bar'|
|
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
|
|
|
test bar PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 INVOKER 111111111111
|
|
|
|
alter procedure bar comment "2222222222" sql security definer|
|
|
|
|
alter procedure bar comment "3333333333"|
|
|
|
|
alter procedure bar|
|
|
|
|
show create procedure bar|
|
|
|
|
Procedure sql_mode Create Procedure
|
2006-03-02 13:18:49 +01:00
|
|
|
bar CREATE DEFINER=`root`@`localhost` PROCEDURE `bar`(x char(16), y int)
|
2005-03-07 17:16:37 +01:00
|
|
|
COMMENT '3333333333'
|
|
|
|
insert into test.t1 values (x, y)
|
|
|
|
show procedure status like 'bar'|
|
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
|
|
|
test bar PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER 3333333333
|
|
|
|
drop procedure bar|
|
|
|
|
drop procedure if exists p1|
|
|
|
|
create procedure p1 ()
|
|
|
|
select (select s1 from t3) from t3|
|
|
|
|
create table t3 (s1 int)|
|
|
|
|
call p1()|
|
|
|
|
(select s1 from t3)
|
|
|
|
insert into t3 values (1)|
|
|
|
|
call p1()|
|
|
|
|
(select s1 from t3)
|
|
|
|
1
|
|
|
|
drop procedure p1|
|
|
|
|
drop table t3|
|
|
|
|
drop function if exists foo|
|
|
|
|
create function `foo` () returns int
|
|
|
|
return 5|
|
|
|
|
select `foo` ()|
|
|
|
|
`foo` ()
|
|
|
|
5
|
|
|
|
drop function `foo`|
|
|
|
|
drop function if exists t1max|
|
|
|
|
create function t1max() returns int
|
2004-04-06 15:48:58 +02:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare x int;
|
|
|
|
select max(data) into x from t1;
|
|
|
|
return x;
|
2004-04-06 15:48:58 +02:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
insert into t1 values ("foo", 3), ("bar", 2), ("zip", 5), ("zap", 1)|
|
|
|
|
select t1max()|
|
|
|
|
t1max()
|
|
|
|
5
|
|
|
|
drop function t1max|
|
|
|
|
create table t3 (
|
|
|
|
v char(16) not null primary key,
|
|
|
|
c int unsigned not null
|
|
|
|
)|
|
|
|
|
create function getcount(s char(16)) returns int
|
2004-04-06 16:29:38 +02:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare x int;
|
|
|
|
select count(*) into x from t3 where v = s;
|
|
|
|
if x = 0 then
|
|
|
|
insert into t3 values (s, 1);
|
|
|
|
else
|
|
|
|
update t3 set c = c+1 where v = s;
|
|
|
|
end if;
|
|
|
|
return x;
|
2004-04-06 16:29:38 +02:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
select * from t1 where data = getcount("bar")|
|
|
|
|
id data
|
|
|
|
zap 1
|
|
|
|
select * from t3|
|
|
|
|
v c
|
|
|
|
bar 4
|
|
|
|
select getcount("zip")|
|
|
|
|
getcount("zip")
|
|
|
|
0
|
|
|
|
select getcount("zip")|
|
|
|
|
getcount("zip")
|
2004-04-06 16:29:38 +02:00
|
|
|
1
|
|
|
|
select * from t3|
|
2005-03-07 17:16:37 +01:00
|
|
|
v c
|
|
|
|
bar 4
|
|
|
|
zip 2
|
|
|
|
select getcount(id) from t1 where data = 3|
|
|
|
|
getcount(id)
|
|
|
|
0
|
|
|
|
select getcount(id) from t1 where data = 5|
|
|
|
|
getcount(id)
|
|
|
|
1
|
|
|
|
select * from t3|
|
|
|
|
v c
|
|
|
|
bar 4
|
|
|
|
zip 3
|
|
|
|
foo 1
|
2004-04-06 16:29:38 +02:00
|
|
|
drop table t3|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop function getcount|
|
2006-02-15 17:28:34 +01:00
|
|
|
drop table if exists t3|
|
|
|
|
drop procedure if exists h_ee|
|
|
|
|
drop procedure if exists h_es|
|
|
|
|
drop procedure if exists h_en|
|
|
|
|
drop procedure if exists h_ew|
|
|
|
|
drop procedure if exists h_ex|
|
|
|
|
drop procedure if exists h_se|
|
|
|
|
drop procedure if exists h_ss|
|
|
|
|
drop procedure if exists h_sn|
|
|
|
|
drop procedure if exists h_sw|
|
|
|
|
drop procedure if exists h_sx|
|
|
|
|
drop procedure if exists h_ne|
|
|
|
|
drop procedure if exists h_ns|
|
|
|
|
drop procedure if exists h_nn|
|
|
|
|
drop procedure if exists h_we|
|
|
|
|
drop procedure if exists h_ws|
|
|
|
|
drop procedure if exists h_ww|
|
|
|
|
drop procedure if exists h_xe|
|
|
|
|
drop procedure if exists h_xs|
|
|
|
|
drop procedure if exists h_xx|
|
|
|
|
create table t3 (a smallint primary key)|
|
|
|
|
insert into t3 (a) values (1)|
|
|
|
|
create procedure h_ee()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for 1062 -- ER_DUP_ENTRY
|
|
|
|
select 'Outer (bad)' as 'h_ee';
|
|
|
|
begin
|
|
|
|
declare continue handler for 1062 -- ER_DUP_ENTRY
|
|
|
|
select 'Inner (good)' as 'h_ee';
|
|
|
|
insert into t3 values (1);
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_es()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for 1062 -- ER_DUP_ENTRY
|
|
|
|
select 'Outer (good)' as 'h_es';
|
|
|
|
begin
|
|
|
|
-- integrity constraint violation
|
|
|
|
declare continue handler for sqlstate '23000'
|
|
|
|
select 'Inner (bad)' as 'h_es';
|
|
|
|
insert into t3 values (1);
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_en()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for 1329 -- ER_SP_FETCH_NO_DATA
|
|
|
|
select 'Outer (good)' as 'h_en';
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
declare continue handler for sqlstate '02000' -- no data
|
|
|
|
select 'Inner (bad)' as 'h_en';
|
|
|
|
select a into x from t3 where a = 42;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_ew()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for 1264 -- ER_WARN_DATA_OUT_OF_RANGE
|
|
|
|
select 'Outer (good)' as 'h_ew';
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlwarning
|
|
|
|
select 'Inner (bad)' as 'h_ew';
|
|
|
|
insert into t3 values (123456789012);
|
|
|
|
end;
|
|
|
|
delete from t3;
|
|
|
|
insert into t3 values (1);
|
|
|
|
end|
|
|
|
|
create procedure h_ex()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for 1062 -- ER_DUP_ENTRY
|
|
|
|
select 'Outer (good)' as 'h_ex';
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception
|
|
|
|
select 'Inner (bad)' as 'h_ex';
|
|
|
|
insert into t3 values (1);
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_se()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
-- integrity constraint violation
|
|
|
|
declare continue handler for sqlstate '23000'
|
|
|
|
select 'Outer (bad)' as 'h_se';
|
|
|
|
begin
|
|
|
|
declare continue handler for 1062 -- ER_DUP_ENTRY
|
|
|
|
select 'Inner (good)' as 'h_se';
|
|
|
|
insert into t3 values (1);
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_ss()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
-- integrity constraint violation
|
|
|
|
declare continue handler for sqlstate '23000'
|
|
|
|
select 'Outer (bad)' as 'h_ss';
|
|
|
|
begin
|
|
|
|
-- integrity constraint violation
|
|
|
|
declare continue handler for sqlstate '23000'
|
|
|
|
select 'Inner (good)' as 'h_ss';
|
|
|
|
insert into t3 values (1);
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_sn()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
-- Note: '02000' is more specific than NOT FOUND ;
|
|
|
|
-- there might be other not found states
|
|
|
|
declare continue handler for sqlstate '02000' -- no data
|
|
|
|
select 'Outer (good)' as 'h_sn';
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
declare continue handler for not found
|
|
|
|
select 'Inner (bad)' as 'h_sn';
|
|
|
|
select a into x from t3 where a = 42;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_sw()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
-- data exception - numeric value out of range
|
|
|
|
declare continue handler for sqlstate '22003'
|
|
|
|
select 'Outer (good)' as 'h_sw';
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlwarning
|
|
|
|
select 'Inner (bad)' as 'h_sw';
|
|
|
|
insert into t3 values (123456789012);
|
|
|
|
end;
|
|
|
|
delete from t3;
|
|
|
|
insert into t3 values (1);
|
|
|
|
end|
|
|
|
|
create procedure h_sx()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
-- integrity constraint violation
|
|
|
|
declare continue handler for sqlstate '23000'
|
|
|
|
select 'Outer (good)' as 'h_sx';
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception
|
|
|
|
select 'Inner (bad)' as 'h_sx';
|
|
|
|
insert into t3 values (1);
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_ne()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for not found
|
|
|
|
select 'Outer (bad)' as 'h_ne';
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
declare continue handler for 1329 -- ER_SP_FETCH_NO_DATA
|
|
|
|
select 'Inner (good)' as 'h_ne';
|
|
|
|
select a into x from t3 where a = 42;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_ns()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for not found
|
|
|
|
select 'Outer (bad)' as 'h_ns';
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
declare continue handler for sqlstate '02000' -- no data
|
|
|
|
select 'Inner (good)' as 'h_ns';
|
|
|
|
select a into x from t3 where a = 42;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_nn()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for not found
|
|
|
|
select 'Outer (bad)' as 'h_nn';
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
declare continue handler for not found
|
|
|
|
select 'Inner (good)' as 'h_nn';
|
|
|
|
select a into x from t3 where a = 42;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_we()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlwarning
|
|
|
|
select 'Outer (bad)' as 'h_we';
|
|
|
|
begin
|
|
|
|
declare continue handler for 1264 -- ER_WARN_DATA_OUT_OF_RANGE
|
|
|
|
select 'Inner (good)' as 'h_we';
|
|
|
|
insert into t3 values (123456789012);
|
|
|
|
end;
|
|
|
|
delete from t3;
|
|
|
|
insert into t3 values (1);
|
|
|
|
end|
|
|
|
|
create procedure h_ws()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlwarning
|
|
|
|
select 'Outer (bad)' as 'h_ws';
|
|
|
|
begin
|
|
|
|
-- data exception - numeric value out of range
|
|
|
|
declare continue handler for sqlstate '22003'
|
|
|
|
select 'Inner (good)' as 'h_ws';
|
|
|
|
insert into t3 values (123456789012);
|
|
|
|
end;
|
|
|
|
delete from t3;
|
|
|
|
insert into t3 values (1);
|
|
|
|
end|
|
|
|
|
create procedure h_ww()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlwarning
|
|
|
|
select 'Outer (bad)' as 'h_ww';
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlwarning
|
|
|
|
select 'Inner (good)' as 'h_ww';
|
|
|
|
insert into t3 values (123456789012);
|
|
|
|
end;
|
|
|
|
delete from t3;
|
|
|
|
insert into t3 values (1);
|
|
|
|
end|
|
|
|
|
create procedure h_xe()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception
|
|
|
|
select 'Outer (bad)' as 'h_xe';
|
|
|
|
begin
|
|
|
|
declare continue handler for 1062 -- ER_DUP_ENTRY
|
|
|
|
select 'Inner (good)' as 'h_xe';
|
|
|
|
insert into t3 values (1);
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_xs()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception
|
|
|
|
select 'Outer (bad)' as 'h_xs';
|
|
|
|
begin
|
|
|
|
-- integrity constraint violation
|
|
|
|
declare continue handler for sqlstate '23000'
|
|
|
|
select 'Inner (good)' as 'h_xs';
|
|
|
|
insert into t3 values (1);
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure h_xx()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception
|
|
|
|
select 'Outer (bad)' as 'h_xx';
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception
|
|
|
|
select 'Inner (good)' as 'h_xx';
|
|
|
|
insert into t3 values (1);
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
call h_ee()|
|
|
|
|
h_ee
|
|
|
|
Inner (good)
|
|
|
|
call h_es()|
|
|
|
|
h_es
|
|
|
|
Outer (good)
|
|
|
|
call h_en()|
|
|
|
|
h_en
|
|
|
|
Outer (good)
|
|
|
|
call h_ew()|
|
|
|
|
h_ew
|
|
|
|
Outer (good)
|
|
|
|
call h_ex()|
|
|
|
|
h_ex
|
|
|
|
Outer (good)
|
|
|
|
call h_se()|
|
|
|
|
h_se
|
|
|
|
Inner (good)
|
|
|
|
call h_ss()|
|
|
|
|
h_ss
|
|
|
|
Inner (good)
|
|
|
|
call h_sn()|
|
|
|
|
h_sn
|
|
|
|
Outer (good)
|
|
|
|
call h_sw()|
|
|
|
|
h_sw
|
|
|
|
Outer (good)
|
|
|
|
call h_sx()|
|
|
|
|
h_sx
|
|
|
|
Outer (good)
|
|
|
|
call h_ne()|
|
|
|
|
h_ne
|
|
|
|
Inner (good)
|
|
|
|
call h_ns()|
|
|
|
|
h_ns
|
|
|
|
Inner (good)
|
|
|
|
call h_nn()|
|
|
|
|
h_nn
|
|
|
|
Inner (good)
|
|
|
|
call h_we()|
|
|
|
|
h_we
|
|
|
|
Inner (good)
|
|
|
|
call h_ws()|
|
|
|
|
h_ws
|
|
|
|
Inner (good)
|
|
|
|
call h_ww()|
|
|
|
|
h_ww
|
|
|
|
Inner (good)
|
|
|
|
call h_xe()|
|
|
|
|
h_xe
|
|
|
|
Inner (good)
|
|
|
|
call h_xs()|
|
|
|
|
h_xs
|
|
|
|
Inner (good)
|
|
|
|
call h_xx()|
|
|
|
|
h_xx
|
|
|
|
Inner (good)
|
|
|
|
drop table t3|
|
|
|
|
drop procedure h_ee|
|
|
|
|
drop procedure h_es|
|
|
|
|
drop procedure h_en|
|
|
|
|
drop procedure h_ew|
|
|
|
|
drop procedure h_ex|
|
|
|
|
drop procedure h_se|
|
|
|
|
drop procedure h_ss|
|
|
|
|
drop procedure h_sn|
|
|
|
|
drop procedure h_sw|
|
|
|
|
drop procedure h_sx|
|
|
|
|
drop procedure h_ne|
|
|
|
|
drop procedure h_ns|
|
|
|
|
drop procedure h_nn|
|
|
|
|
drop procedure h_we|
|
|
|
|
drop procedure h_ws|
|
|
|
|
drop procedure h_ww|
|
|
|
|
drop procedure h_xe|
|
|
|
|
drop procedure h_xs|
|
|
|
|
drop procedure h_xx|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop procedure if exists bug822|
|
|
|
|
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);
|
2004-05-28 18:33:14 +02:00
|
|
|
end if;
|
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
delete from t1|
|
|
|
|
call bug822('foo', 42)|
|
|
|
|
call bug822('foo', 42)|
|
|
|
|
call bug822('bar', 666)|
|
|
|
|
select * from t1|
|
|
|
|
id data
|
|
|
|
foo 42
|
|
|
|
bar 666
|
|
|
|
delete from t1|
|
|
|
|
drop procedure bug822|
|
|
|
|
drop procedure if exists bug1495|
|
|
|
|
create procedure bug1495()
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
select data into x from t1 order by id limit 1;
|
|
|
|
if x > 10 then
|
|
|
|
insert into t1 values ("less", x-10);
|
|
|
|
else
|
|
|
|
insert into t1 values ("more", x+10);
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
insert into t1 values ('foo', 12)|
|
|
|
|
call bug1495()|
|
|
|
|
delete from t1 where id='foo'|
|
|
|
|
insert into t1 values ('bar', 7)|
|
|
|
|
call bug1495()|
|
|
|
|
delete from t1 where id='bar'|
|
|
|
|
select * from t1|
|
|
|
|
id data
|
|
|
|
less 2
|
|
|
|
more 17
|
|
|
|
delete from t1|
|
|
|
|
drop procedure bug1495|
|
|
|
|
drop procedure if exists bug1547|
|
|
|
|
create procedure bug1547(s char(16))
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
select data into x from t1 where s = id limit 1;
|
|
|
|
if x > 10 then
|
|
|
|
insert into t1 values ("less", x-10);
|
|
|
|
else
|
|
|
|
insert into t1 values ("more", x+10);
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
insert into t1 values ("foo", 12), ("bar", 7)|
|
|
|
|
call bug1547("foo")|
|
|
|
|
call bug1547("bar")|
|
|
|
|
select * from t1|
|
|
|
|
id data
|
|
|
|
foo 12
|
|
|
|
bar 7
|
|
|
|
less 2
|
|
|
|
more 17
|
|
|
|
delete from t1|
|
|
|
|
drop procedure bug1547|
|
|
|
|
drop table if exists t70|
|
|
|
|
create table t70 (s1 int,s2 int)|
|
|
|
|
insert into t70 values (1,2)|
|
|
|
|
drop procedure if exists bug1656|
|
|
|
|
create procedure bug1656(out p1 int, out p2 int)
|
|
|
|
select * into p1, p1 from t70|
|
|
|
|
call bug1656(@1, @2)|
|
|
|
|
select @1, @2|
|
|
|
|
@1 @2
|
|
|
|
2 NULL
|
|
|
|
drop table t70|
|
|
|
|
drop procedure bug1656|
|
|
|
|
create table t3(a int)|
|
|
|
|
drop procedure if exists bug1862|
|
|
|
|
create procedure bug1862()
|
|
|
|
begin
|
|
|
|
insert into t3 values(2);
|
|
|
|
flush tables;
|
|
|
|
end|
|
|
|
|
call bug1862()|
|
|
|
|
call bug1862()|
|
|
|
|
select * from t3|
|
|
|
|
a
|
|
|
|
2
|
|
|
|
2
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug1862|
|
|
|
|
drop procedure if exists bug1874|
|
|
|
|
create procedure bug1874()
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
declare y double;
|
|
|
|
select max(data) into x from t1;
|
|
|
|
insert into t2 values ("max", x, 0);
|
|
|
|
select min(data) into x from t1;
|
|
|
|
insert into t2 values ("min", x, 0);
|
|
|
|
select sum(data) into x from t1;
|
|
|
|
insert into t2 values ("sum", x, 0);
|
|
|
|
select avg(data) into y from t1;
|
|
|
|
insert into t2 values ("avg", 0, y);
|
|
|
|
end|
|
|
|
|
insert into t1 (data) values (3), (1), (5), (9), (4)|
|
|
|
|
call bug1874()|
|
|
|
|
select * from t2|
|
|
|
|
s i d
|
|
|
|
max 9 0
|
|
|
|
min 1 0
|
|
|
|
sum 22 0
|
|
|
|
avg 0 4.4
|
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
|
|
|
drop procedure bug1874|
|
|
|
|
drop procedure if exists bug2260|
|
|
|
|
create procedure bug2260()
|
|
|
|
begin
|
|
|
|
declare v1 int;
|
|
|
|
declare c1 cursor for select data from t1;
|
|
|
|
declare continue handler for not found set @x2 = 1;
|
|
|
|
open c1;
|
|
|
|
fetch c1 into v1;
|
|
|
|
set @x2 = 2;
|
|
|
|
close c1;
|
|
|
|
end|
|
|
|
|
call bug2260()|
|
|
|
|
select @x2|
|
|
|
|
@x2
|
|
|
|
2
|
|
|
|
drop procedure bug2260|
|
2005-11-26 17:15:17 +01:00
|
|
|
drop procedure if exists bug2267_1|
|
|
|
|
create procedure bug2267_1()
|
|
|
|
begin
|
|
|
|
show procedure status;
|
|
|
|
end|
|
|
|
|
drop procedure if exists bug2267_2|
|
|
|
|
create procedure bug2267_2()
|
|
|
|
begin
|
|
|
|
show function status;
|
|
|
|
end|
|
|
|
|
drop procedure if exists bug2267_3|
|
|
|
|
create procedure bug2267_3()
|
|
|
|
begin
|
|
|
|
show create procedure bug2267_1;
|
|
|
|
end|
|
|
|
|
drop procedure if exists bug2267_4|
|
|
|
|
drop function if exists bug2267_4|
|
|
|
|
create procedure bug2267_4()
|
|
|
|
begin
|
|
|
|
show create function bug2267_4;
|
|
|
|
end|
|
|
|
|
create function bug2267_4() returns int return 100|
|
|
|
|
call bug2267_1()|
|
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
|
|
|
test bug2267_1 PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
|
|
|
test bug2267_2 PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
|
|
|
test bug2267_3 PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
|
|
|
test bug2267_4 PROCEDURE root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
|
|
|
call bug2267_2()|
|
|
|
|
Db Name Type Definer Modified Created Security_type Comment
|
|
|
|
test bug2267_4 FUNCTION root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 DEFINER
|
|
|
|
call bug2267_3()|
|
|
|
|
Procedure sql_mode Create Procedure
|
2006-03-02 13:18:49 +01:00
|
|
|
bug2267_1 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug2267_1`()
|
2005-11-26 17:15:17 +01:00
|
|
|
begin
|
|
|
|
show procedure status;
|
|
|
|
end
|
|
|
|
call bug2267_4()|
|
|
|
|
Function sql_mode Create Function
|
2006-03-02 13:18:49 +01:00
|
|
|
bug2267_4 CREATE DEFINER=`root`@`localhost` FUNCTION `bug2267_4`() RETURNS int(11)
|
2005-11-26 17:15:17 +01:00
|
|
|
return 100
|
|
|
|
drop procedure bug2267_1|
|
|
|
|
drop procedure bug2267_2|
|
|
|
|
drop procedure bug2267_3|
|
|
|
|
drop procedure bug2267_4|
|
|
|
|
drop function bug2267_4|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop procedure if exists bug2227|
|
|
|
|
create procedure bug2227(x int)
|
|
|
|
begin
|
|
|
|
declare y float default 2.6;
|
|
|
|
declare z char(16) default "zzz";
|
|
|
|
select 1.3, x, y, 42, z;
|
|
|
|
end|
|
|
|
|
call bug2227(9)|
|
|
|
|
1.3 x y 42 z
|
|
|
|
1.3 9 2.6 42 zzz
|
|
|
|
drop procedure bug2227|
|
2005-11-26 17:15:17 +01:00
|
|
|
drop procedure if exists bug2614|
|
|
|
|
create procedure bug2614()
|
|
|
|
begin
|
|
|
|
drop table if exists t3;
|
|
|
|
create table t3 (id int default '0' not null);
|
|
|
|
insert into t3 select 12;
|
|
|
|
insert into t3 select * from t3;
|
|
|
|
end|
|
|
|
|
call bug2614()|
|
|
|
|
call bug2614()|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug2614|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop function if exists bug2674|
|
|
|
|
create function bug2674() returns int
|
|
|
|
return @@sort_buffer_size|
|
|
|
|
set @osbs = @@sort_buffer_size|
|
|
|
|
set @@sort_buffer_size = 262000|
|
|
|
|
select bug2674()|
|
|
|
|
bug2674()
|
|
|
|
262000
|
|
|
|
drop function bug2674|
|
|
|
|
set @@sort_buffer_size = @osbs|
|
|
|
|
drop procedure if exists bug3259_1 |
|
|
|
|
create procedure bug3259_1 () begin end|
|
|
|
|
drop procedure if exists BUG3259_2 |
|
|
|
|
create procedure BUG3259_2 () begin end|
|
|
|
|
drop procedure if exists Bug3259_3 |
|
|
|
|
create procedure Bug3259_3 () begin end|
|
|
|
|
call BUG3259_1()|
|
|
|
|
call BUG3259_1()|
|
|
|
|
call bug3259_2()|
|
|
|
|
call Bug3259_2()|
|
|
|
|
call bug3259_3()|
|
|
|
|
call bUG3259_3()|
|
|
|
|
drop procedure bUg3259_1|
|
|
|
|
drop procedure BuG3259_2|
|
|
|
|
drop procedure BUG3259_3|
|
|
|
|
drop function if exists bug2772|
|
|
|
|
create function bug2772() returns char(10) character set latin2
|
|
|
|
return 'a'|
|
|
|
|
select bug2772()|
|
|
|
|
bug2772()
|
|
|
|
a
|
|
|
|
drop function bug2772|
|
|
|
|
drop procedure if exists bug2776_1|
|
|
|
|
create procedure bug2776_1(out x int)
|
|
|
|
begin
|
|
|
|
declare v int;
|
|
|
|
set v = default;
|
|
|
|
set x = v;
|
|
|
|
end|
|
|
|
|
drop procedure if exists bug2776_2|
|
|
|
|
create procedure bug2776_2(out x int)
|
|
|
|
begin
|
|
|
|
declare v int default 42;
|
|
|
|
set v = default;
|
|
|
|
set x = v;
|
|
|
|
end|
|
|
|
|
set @x = 1|
|
|
|
|
call bug2776_1(@x)|
|
|
|
|
select @x|
|
|
|
|
@x
|
|
|
|
NULL
|
|
|
|
call bug2776_2(@x)|
|
|
|
|
select @x|
|
|
|
|
@x
|
|
|
|
42
|
|
|
|
drop procedure bug2776_1|
|
|
|
|
drop procedure bug2776_2|
|
|
|
|
create table t3 (s1 smallint)|
|
|
|
|
insert into t3 values (123456789012)|
|
|
|
|
Warnings:
|
|
|
|
Warning 1264 Out of range value adjusted for column 's1' at row 1
|
|
|
|
drop procedure if exists bug2780|
|
|
|
|
create procedure bug2780()
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlwarning set @x = 1;
|
|
|
|
set @x = 0;
|
|
|
|
insert into t3 values (123456789012);
|
|
|
|
insert into t3 values (0);
|
|
|
|
end|
|
|
|
|
call bug2780()|
|
|
|
|
select @x|
|
|
|
|
@x
|
|
|
|
1
|
|
|
|
select * from t3|
|
|
|
|
s1
|
|
|
|
32767
|
|
|
|
32767
|
|
|
|
drop procedure bug2780|
|
|
|
|
drop table t3|
|
|
|
|
create table t3 (content varchar(10) )|
|
|
|
|
insert into t3 values ("test1")|
|
|
|
|
insert into t3 values ("test2")|
|
|
|
|
create table t4 (f1 int, rc int, t3 int)|
|
|
|
|
drop procedure if exists bug1863|
|
|
|
|
create procedure bug1863(in1 int)
|
|
|
|
begin
|
|
|
|
declare ind int default 0;
|
|
|
|
declare t1 int;
|
|
|
|
declare t2 int;
|
|
|
|
declare t3 int;
|
|
|
|
declare rc int default 0;
|
|
|
|
declare continue handler for 1065 set rc = 1;
|
|
|
|
drop temporary table if exists temp_t1;
|
|
|
|
create temporary table temp_t1 (
|
|
|
|
f1 int auto_increment, f2 varchar(20), primary key (f1)
|
|
|
|
);
|
|
|
|
insert into temp_t1 (f2) select content from t3;
|
|
|
|
select f2 into t3 from temp_t1 where f1 = 10;
|
|
|
|
if (rc) then
|
|
|
|
insert into t4 values (1, rc, t3);
|
|
|
|
end if;
|
|
|
|
insert into t4 values (2, rc, t3);
|
|
|
|
end|
|
|
|
|
call bug1863(10)|
|
2005-04-22 12:53:48 +02:00
|
|
|
Warnings:
|
|
|
|
Note 1051 Unknown table 'temp_t1'
|
2006-01-17 19:10:47 +01:00
|
|
|
Warning 1329 No data - zero rows fetched, selected, or processed
|
2005-03-07 17:16:37 +01:00
|
|
|
call bug1863(10)|
|
2005-04-22 12:53:48 +02:00
|
|
|
Warnings:
|
2006-01-17 19:10:47 +01:00
|
|
|
Warning 1329 No data - zero rows fetched, selected, or processed
|
2005-03-07 17:16:37 +01:00
|
|
|
select * from t4|
|
|
|
|
f1 rc t3
|
|
|
|
2 0 NULL
|
|
|
|
2 0 NULL
|
|
|
|
drop procedure bug1863|
|
|
|
|
drop temporary table temp_t1;
|
|
|
|
drop table t3, t4|
|
|
|
|
create table t3 (
|
|
|
|
OrderID int not null,
|
|
|
|
MarketID int,
|
2004-05-28 18:33:14 +02:00
|
|
|
primary key (OrderID)
|
|
|
|
)|
|
|
|
|
create table t4 (
|
|
|
|
MarketID int not null,
|
|
|
|
Market varchar(60),
|
|
|
|
Status char(1),
|
|
|
|
primary key (MarketID)
|
|
|
|
)|
|
|
|
|
insert t3 (OrderID,MarketID) values (1,1)|
|
|
|
|
insert t3 (OrderID,MarketID) values (2,2)|
|
|
|
|
insert t4 (MarketID,Market,Status) values (1,"MarketID One","A")|
|
|
|
|
insert t4 (MarketID,Market,Status) values (2,"MarketID Two","A")|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug2656_1|
|
2004-05-28 18:33:14 +02:00
|
|
|
create procedure bug2656_1()
|
|
|
|
begin
|
|
|
|
select
|
|
|
|
m.Market
|
|
|
|
from t4 m JOIN t3 o
|
|
|
|
ON o.MarketID != 1 and o.MarketID = m.MarketID;
|
|
|
|
end |
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug2656_2|
|
2004-05-28 18:33:14 +02:00
|
|
|
create procedure bug2656_2()
|
|
|
|
begin
|
|
|
|
select
|
|
|
|
m.Market
|
|
|
|
from
|
|
|
|
t4 m, t3 o
|
|
|
|
where
|
|
|
|
m.MarketID != 1 and m.MarketID = o.MarketID;
|
|
|
|
end |
|
|
|
|
call bug2656_1()|
|
|
|
|
Market
|
|
|
|
MarketID Two
|
|
|
|
call bug2656_1()|
|
|
|
|
Market
|
|
|
|
MarketID Two
|
|
|
|
call bug2656_2()|
|
|
|
|
Market
|
|
|
|
MarketID Two
|
|
|
|
call bug2656_2()|
|
|
|
|
Market
|
|
|
|
MarketID Two
|
|
|
|
drop procedure bug2656_1|
|
|
|
|
drop procedure bug2656_2|
|
|
|
|
drop table t3, t4|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug3426|
|
2004-05-28 18:33:14 +02:00
|
|
|
create procedure bug3426(in_time int unsigned, out x int)
|
|
|
|
begin
|
|
|
|
if in_time is null then
|
|
|
|
set @stamped_time=10;
|
|
|
|
set x=1;
|
|
|
|
else
|
|
|
|
set @stamped_time=in_time;
|
|
|
|
set x=2;
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
call bug3426(1000, @i)|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
@i time
|
|
|
|
2 01-01-1970 03:16:40
|
|
|
|
call bug3426(NULL, @i)|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
@i time
|
|
|
|
1 01-01-1970 03:00:10
|
|
|
|
alter procedure bug3426 sql security invoker|
|
|
|
|
call bug3426(NULL, @i)|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
@i time
|
|
|
|
1 01-01-1970 03:00:10
|
|
|
|
call bug3426(1000, @i)|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
@i time
|
|
|
|
2 01-01-1970 03:16:40
|
|
|
|
drop procedure bug3426|
|
|
|
|
create table t3 (
|
|
|
|
id int unsigned auto_increment not null primary key,
|
|
|
|
title VARCHAR(200),
|
|
|
|
body text,
|
|
|
|
fulltext (title,body)
|
|
|
|
)|
|
|
|
|
insert into t3 (title,body) values
|
|
|
|
('MySQL Tutorial','DBMS stands for DataBase ...'),
|
|
|
|
('How To Use MySQL Well','After you went through a ...'),
|
|
|
|
('Optimizing MySQL','In this tutorial we will show ...'),
|
|
|
|
('1001 MySQL Tricks','1. Never run mysqld as root. 2. ...'),
|
|
|
|
('MySQL vs. YourSQL','In the following database comparison ...'),
|
|
|
|
('MySQL Security','When configured properly, MySQL ...')|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug3734 |
|
2004-05-28 18:33:14 +02:00
|
|
|
create procedure bug3734 (param1 varchar(100))
|
|
|
|
select * from t3 where match (title,body) against (param1)|
|
|
|
|
call bug3734('database')|
|
|
|
|
id title body
|
|
|
|
5 MySQL vs. YourSQL In the following database comparison ...
|
|
|
|
1 MySQL Tutorial DBMS stands for DataBase ...
|
|
|
|
call bug3734('Security')|
|
|
|
|
id title body
|
|
|
|
6 MySQL Security When configured properly, MySQL ...
|
|
|
|
drop procedure bug3734|
|
|
|
|
drop table t3|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug3863|
|
2004-05-28 18:33:14 +02:00
|
|
|
create procedure bug3863()
|
|
|
|
begin
|
|
|
|
set @a = 0;
|
|
|
|
while @a < 5 do
|
|
|
|
set @a = @a + 1;
|
|
|
|
end while;
|
|
|
|
end|
|
|
|
|
call bug3863()|
|
|
|
|
select @a|
|
|
|
|
@a
|
|
|
|
5
|
|
|
|
call bug3863()|
|
|
|
|
select @a|
|
|
|
|
@a
|
|
|
|
5
|
|
|
|
drop procedure bug3863|
|
2004-05-28 19:43:06 +02:00
|
|
|
create table t3 (
|
|
|
|
id int(10) unsigned not null default 0,
|
|
|
|
rid int(10) unsigned not null default 0,
|
|
|
|
msg text not null,
|
|
|
|
primary key (id),
|
|
|
|
unique key rid (rid, id)
|
|
|
|
)|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug2460_1|
|
2004-05-28 19:43:06 +02:00
|
|
|
create procedure bug2460_1(in v int)
|
|
|
|
begin
|
|
|
|
( select n0.id from t3 as n0 where n0.id = v )
|
|
|
|
union
|
|
|
|
( select n0.id from t3 as n0, t3 as n1
|
|
|
|
where n0.id = n1.rid and n1.id = v )
|
|
|
|
union
|
|
|
|
( select n0.id from t3 as n0, t3 as n1, t3 as n2
|
|
|
|
where n0.id = n1.rid and n1.id = n2.rid and n2.id = v );
|
|
|
|
end|
|
|
|
|
call bug2460_1(2)|
|
|
|
|
id
|
|
|
|
call bug2460_1(2)|
|
|
|
|
id
|
|
|
|
insert into t3 values (1, 1, 'foo'), (2, 1, 'bar'), (3, 1, 'zip zap')|
|
|
|
|
call bug2460_1(2)|
|
|
|
|
id
|
|
|
|
2
|
|
|
|
1
|
|
|
|
call bug2460_1(2)|
|
|
|
|
id
|
|
|
|
2
|
|
|
|
1
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug2460_2|
|
2004-05-28 19:43:06 +02:00
|
|
|
create procedure bug2460_2()
|
|
|
|
begin
|
|
|
|
drop table if exists t3;
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
create temporary table t3 (s1 int);
|
2004-05-28 19:43:06 +02:00
|
|
|
insert into t3 select 1 union select 1;
|
|
|
|
end|
|
|
|
|
call bug2460_2()|
|
|
|
|
call bug2460_2()|
|
|
|
|
select * from t3|
|
|
|
|
s1
|
|
|
|
1
|
|
|
|
drop procedure bug2460_1|
|
|
|
|
drop procedure bug2460_2|
|
|
|
|
drop table t3|
|
2004-06-09 14:19:43 +02:00
|
|
|
set @@sql_mode = ''|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug2564_1|
|
2004-06-09 14:19:43 +02:00
|
|
|
create procedure bug2564_1()
|
|
|
|
comment 'Joe''s procedure'
|
|
|
|
insert into `t1` values ("foo", 1)|
|
|
|
|
set @@sql_mode = 'ANSI_QUOTES'|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug2564_2|
|
2004-06-09 14:19:43 +02:00
|
|
|
create procedure bug2564_2()
|
|
|
|
insert into "t1" values ('foo', 1)|
|
|
|
|
set @@sql_mode = ''$
|
2004-12-28 16:58:14 +01:00
|
|
|
drop function if exists bug2564_3$
|
2004-06-09 14:19:43 +02:00
|
|
|
create function bug2564_3(x int, y int) returns int
|
|
|
|
return x || y$
|
|
|
|
set @@sql_mode = 'ANSI'$
|
2004-12-28 16:58:14 +01:00
|
|
|
drop function if exists bug2564_4$
|
2004-06-09 14:19:43 +02:00
|
|
|
create function bug2564_4(x int, y int) returns int
|
|
|
|
return x || y$
|
|
|
|
set @@sql_mode = ''|
|
|
|
|
show create procedure bug2564_1|
|
|
|
|
Procedure sql_mode Create Procedure
|
2006-03-02 13:18:49 +01:00
|
|
|
bug2564_1 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug2564_1`()
|
2004-06-09 14:19:43 +02:00
|
|
|
COMMENT 'Joe''s procedure'
|
|
|
|
insert into `t1` values ("foo", 1)
|
|
|
|
show create procedure bug2564_2|
|
|
|
|
Procedure sql_mode Create Procedure
|
2006-03-02 13:18:49 +01:00
|
|
|
bug2564_2 ANSI_QUOTES CREATE DEFINER="root"@"localhost" PROCEDURE "bug2564_2"()
|
2004-06-09 14:19:43 +02:00
|
|
|
insert into "t1" values ('foo', 1)
|
|
|
|
show create function bug2564_3|
|
|
|
|
Function sql_mode Create Function
|
2006-03-02 13:18:49 +01:00
|
|
|
bug2564_3 CREATE DEFINER=`root`@`localhost` FUNCTION `bug2564_3`(x int, y int) RETURNS int(11)
|
2004-06-09 14:19:43 +02:00
|
|
|
return x || y
|
|
|
|
show create function bug2564_4|
|
|
|
|
Function sql_mode Create Function
|
2006-03-02 13:18:49 +01:00
|
|
|
bug2564_4 REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI CREATE DEFINER="root"@"localhost" FUNCTION "bug2564_4"(x int, y int) RETURNS int(11)
|
2004-06-09 14:19:43 +02:00
|
|
|
return x || y
|
|
|
|
drop procedure bug2564_1|
|
|
|
|
drop procedure bug2564_2|
|
|
|
|
drop function bug2564_3|
|
|
|
|
drop function bug2564_4|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop function if exists bug3132|
|
2004-06-10 17:07:53 +02:00
|
|
|
create function bug3132(s char(20)) returns char(50)
|
|
|
|
return concat('Hello, ', s, '!')|
|
|
|
|
select bug3132('Bob') union all select bug3132('Judy')|
|
|
|
|
bug3132('Bob')
|
|
|
|
Hello, Bob!
|
|
|
|
Hello, Judy!
|
|
|
|
drop function bug3132|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug3843|
|
2004-06-14 12:38:54 +02:00
|
|
|
create procedure bug3843()
|
|
|
|
analyze table t1|
|
|
|
|
call bug3843()|
|
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 analyze status OK
|
|
|
|
call bug3843()|
|
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 analyze status Table is already up to date
|
|
|
|
select 1+2|
|
|
|
|
1+2
|
|
|
|
3
|
|
|
|
drop procedure bug3843|
|
2004-06-15 14:26:19 +02:00
|
|
|
create table t3 ( s1 char(10) )|
|
|
|
|
insert into t3 values ('a'), ('b')|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug3368|
|
2004-06-15 14:26:19 +02:00
|
|
|
create procedure bug3368(v char(10))
|
|
|
|
begin
|
|
|
|
select group_concat(v) from t3;
|
|
|
|
end|
|
|
|
|
call bug3368('x')|
|
|
|
|
group_concat(v)
|
|
|
|
x,x
|
|
|
|
call bug3368('yz')|
|
|
|
|
group_concat(v)
|
|
|
|
yz,yz
|
|
|
|
drop procedure bug3368|
|
|
|
|
drop table t3|
|
2005-01-03 20:04:33 +01:00
|
|
|
create table t3 (f1 int, f2 int)|
|
|
|
|
insert into t3 values (1,1)|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug4579_1|
|
2004-07-22 16:46:59 +02:00
|
|
|
create procedure bug4579_1 ()
|
|
|
|
begin
|
|
|
|
declare sf1 int;
|
|
|
|
select f1 into sf1 from t3 where f1=1 and f2=1;
|
|
|
|
update t3 set f2 = f2 + 1 where f1=1 and f2=1;
|
|
|
|
call bug4579_2();
|
|
|
|
end|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug4579_2|
|
2004-07-22 16:46:59 +02:00
|
|
|
create procedure bug4579_2 ()
|
|
|
|
begin
|
|
|
|
end|
|
|
|
|
call bug4579_1()|
|
|
|
|
call bug4579_1()|
|
2005-04-22 12:53:48 +02:00
|
|
|
Warnings:
|
2006-01-17 19:10:47 +01:00
|
|
|
Warning 1329 No data - zero rows fetched, selected, or processed
|
2004-07-22 16:46:59 +02:00
|
|
|
call bug4579_1()|
|
2005-04-22 12:53:48 +02:00
|
|
|
Warnings:
|
2006-01-17 19:10:47 +01:00
|
|
|
Warning 1329 No data - zero rows fetched, selected, or processed
|
2004-07-22 16:46:59 +02:00
|
|
|
drop procedure bug4579_1|
|
|
|
|
drop procedure bug4579_2|
|
|
|
|
drop table t3|
|
2005-03-04 22:14:35 +01:00
|
|
|
drop procedure if exists bug2773|
|
|
|
|
create function bug2773() returns int return null|
|
|
|
|
create table t3 as select bug2773()|
|
|
|
|
show create table t3|
|
|
|
|
Table Create Table
|
|
|
|
t3 CREATE TABLE `t3` (
|
|
|
|
`bug2773()` int(11) default NULL
|
|
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
|
|
drop table t3|
|
|
|
|
drop function bug2773|
|
|
|
|
drop procedure if exists bug3788|
|
|
|
|
create function bug3788() returns date return cast("2005-03-04" as date)|
|
|
|
|
select bug3788()|
|
|
|
|
bug3788()
|
|
|
|
2005-03-04
|
|
|
|
drop function bug3788|
|
2005-10-13 16:16:19 +02:00
|
|
|
create function bug3788() returns binary(1) return 5|
|
2005-03-04 22:14:35 +01:00
|
|
|
select bug3788()|
|
|
|
|
bug3788()
|
|
|
|
5
|
|
|
|
drop function bug3788|
|
2004-07-23 19:52:06 +02:00
|
|
|
create table t3 (f1 int, f2 int, f3 int)|
|
|
|
|
insert into t3 values (1,1,1)|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug4726|
|
2004-07-23 19:52:06 +02:00
|
|
|
create procedure bug4726()
|
|
|
|
begin
|
|
|
|
declare tmp_o_id INT;
|
|
|
|
declare tmp_d_id INT default 1;
|
|
|
|
while tmp_d_id <= 2 do
|
|
|
|
begin
|
|
|
|
select f1 into tmp_o_id from t3 where f2=1 and f3=1;
|
|
|
|
set tmp_d_id = tmp_d_id + 1;
|
|
|
|
end;
|
|
|
|
end while;
|
|
|
|
end|
|
|
|
|
call bug4726()|
|
|
|
|
call bug4726()|
|
|
|
|
call bug4726()|
|
|
|
|
drop procedure bug4726|
|
|
|
|
drop table t3|
|
2004-12-28 16:58:14 +01:00
|
|
|
drop procedure if exists bug4902|
|
2004-08-06 13:47:01 +02:00
|
|
|
create procedure bug4902()
|
|
|
|
begin
|
|
|
|
show charset like 'foo';
|
|
|
|
show collation like 'foo';
|
|
|
|
show column types;
|
|
|
|
show create table t1;
|
|
|
|
show create database test;
|
|
|
|
show databases like 'foo';
|
|
|
|
show errors;
|
|
|
|
show columns from t1;
|
|
|
|
show keys from t1;
|
|
|
|
show open tables like 'foo';
|
|
|
|
show privileges;
|
|
|
|
show status like 'foo';
|
|
|
|
show tables like 'foo';
|
|
|
|
show variables like 'foo';
|
|
|
|
show warnings;
|
|
|
|
end|
|
|
|
|
call bug4902()|
|
|
|
|
Charset Description Default collation Maxlen
|
|
|
|
Collation Charset Id Default Compiled Sortlen
|
|
|
|
Type Size Min_Value Max_Value Prec Scale Nullable Auto_Increment Unsigned Zerofill Searchable Case_Sensitive Default Comment
|
|
|
|
tinyint 1 -128 127 0 0 YES YES NO YES YES NO NULL,0 A very small integer
|
|
|
|
tinyint unsigned 1 0 255 0 0 YES YES YES YES YES NO NULL,0 A very small integer
|
|
|
|
Table Create Table
|
|
|
|
t1 CREATE TABLE `t1` (
|
2005-01-15 02:09:35 +01:00
|
|
|
`id` char(16) NOT NULL default '',
|
2004-10-02 21:20:08 +02:00
|
|
|
`data` int(11) NOT NULL
|
2004-08-06 13:47:01 +02:00
|
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
|
|
Database Create Database
|
|
|
|
test CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET latin1 */
|
|
|
|
Database (foo)
|
|
|
|
Level Code Message
|
|
|
|
Field Type Null Key Default Extra
|
2004-12-10 10:07:11 +01:00
|
|
|
id char(16) NO
|
|
|
|
data int(11) NO
|
2004-08-06 13:47:01 +02:00
|
|
|
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
|
|
|
|
Database Table In_use Name_locked
|
|
|
|
Privilege Context Comment
|
|
|
|
Alter Tables To alter the table
|
2004-12-23 11:46:24 +01:00
|
|
|
Alter routine Functions,Procedures To alter or drop stored functions/procedures
|
2004-08-06 13:47:01 +02:00
|
|
|
Create Databases,Tables,Indexes To create new databases and tables
|
2004-12-23 11:46:24 +01:00
|
|
|
Create routine Functions,Procedures To use CREATE FUNCTION/PROCEDURE
|
2004-08-06 13:47:01 +02:00
|
|
|
Create temporary tables Databases To use CREATE TEMPORARY TABLE
|
|
|
|
Create view Tables To create new views
|
2005-03-22 15:54:18 +01:00
|
|
|
Create user Server Admin To create new users
|
2004-08-06 13:47:01 +02:00
|
|
|
Delete Tables To delete existing rows
|
|
|
|
Drop Databases,Tables To drop databases, tables, and views
|
2004-12-23 11:46:24 +01:00
|
|
|
Execute Functions,Procedures To execute stored routines
|
2004-08-06 13:47:01 +02:00
|
|
|
File File access on server To read and write files on the server
|
2004-12-23 11:46:24 +01:00
|
|
|
Grant option Databases,Tables,Functions,Procedures To give to other users those privileges you possess
|
2004-08-06 13:47:01 +02:00
|
|
|
Index Tables To create or drop indexes
|
|
|
|
Insert Tables To insert data into tables
|
|
|
|
Lock tables Databases To use LOCK TABLES (together with SELECT privilege)
|
|
|
|
Process Server Admin To view the plain text of currently executing queries
|
|
|
|
References Databases,Tables To have references on tables
|
|
|
|
Reload Server Admin To reload or refresh tables, logs and privileges
|
|
|
|
Replication client Server Admin To ask where the slave or master servers are
|
|
|
|
Replication slave Server Admin To read binary log events from the master
|
|
|
|
Select Tables To retrieve rows from table
|
|
|
|
Show databases Server Admin To see all databases with SHOW DATABASES
|
|
|
|
Show view Tables To see views with SHOW CREATE VIEW
|
|
|
|
Shutdown Server Admin To shut down the server
|
|
|
|
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
|
|
|
|
Update Tables To update existing rows
|
|
|
|
Usage Server Admin No privileges - allow connect only
|
|
|
|
Variable_name Value
|
2004-10-10 12:15:14 +02:00
|
|
|
Tables_in_test (foo)
|
2004-08-06 13:47:01 +02:00
|
|
|
Variable_name Value
|
|
|
|
Level Code Message
|
|
|
|
call bug4902()|
|
|
|
|
Charset Description Default collation Maxlen
|
|
|
|
Collation Charset Id Default Compiled Sortlen
|
|
|
|
Type Size Min_Value Max_Value Prec Scale Nullable Auto_Increment Unsigned Zerofill Searchable Case_Sensitive Default Comment
|
|
|
|
tinyint 1 -128 127 0 0 YES YES NO YES YES NO NULL,0 A very small integer
|
|
|
|
tinyint unsigned 1 0 255 0 0 YES YES YES YES YES NO NULL,0 A very small integer
|
|
|
|
Table Create Table
|
|
|
|
t1 CREATE TABLE `t1` (
|
2005-01-15 02:09:35 +01:00
|
|
|
`id` char(16) NOT NULL default '',
|
2004-10-02 21:20:08 +02:00
|
|
|
`data` int(11) NOT NULL
|
2004-08-06 13:47:01 +02:00
|
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
|
|
Database Create Database
|
|
|
|
test CREATE DATABASE `test` /*!40100 DEFAULT CHARACTER SET latin1 */
|
|
|
|
Database (foo)
|
|
|
|
Level Code Message
|
|
|
|
Field Type Null Key Default Extra
|
2004-12-10 10:07:11 +01:00
|
|
|
id char(16) NO
|
|
|
|
data int(11) NO
|
2004-08-06 13:47:01 +02:00
|
|
|
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
|
|
|
|
Database Table In_use Name_locked
|
|
|
|
Privilege Context Comment
|
|
|
|
Alter Tables To alter the table
|
2004-12-23 11:46:24 +01:00
|
|
|
Alter routine Functions,Procedures To alter or drop stored functions/procedures
|
2004-08-06 13:47:01 +02:00
|
|
|
Create Databases,Tables,Indexes To create new databases and tables
|
2004-12-23 11:46:24 +01:00
|
|
|
Create routine Functions,Procedures To use CREATE FUNCTION/PROCEDURE
|
2004-08-06 13:47:01 +02:00
|
|
|
Create temporary tables Databases To use CREATE TEMPORARY TABLE
|
|
|
|
Create view Tables To create new views
|
2005-03-22 15:54:18 +01:00
|
|
|
Create user Server Admin To create new users
|
2004-08-06 13:47:01 +02:00
|
|
|
Delete Tables To delete existing rows
|
|
|
|
Drop Databases,Tables To drop databases, tables, and views
|
2004-12-23 11:46:24 +01:00
|
|
|
Execute Functions,Procedures To execute stored routines
|
2004-08-06 13:47:01 +02:00
|
|
|
File File access on server To read and write files on the server
|
2004-12-23 11:46:24 +01:00
|
|
|
Grant option Databases,Tables,Functions,Procedures To give to other users those privileges you possess
|
2004-08-06 13:47:01 +02:00
|
|
|
Index Tables To create or drop indexes
|
|
|
|
Insert Tables To insert data into tables
|
|
|
|
Lock tables Databases To use LOCK TABLES (together with SELECT privilege)
|
2005-03-07 17:16:37 +01:00
|
|
|
Process Server Admin To view the plain text of currently executing queries
|
|
|
|
References Databases,Tables To have references on tables
|
|
|
|
Reload Server Admin To reload or refresh tables, logs and privileges
|
|
|
|
Replication client Server Admin To ask where the slave or master servers are
|
|
|
|
Replication slave Server Admin To read binary log events from the master
|
|
|
|
Select Tables To retrieve rows from table
|
|
|
|
Show databases Server Admin To see all databases with SHOW DATABASES
|
|
|
|
Show view Tables To see views with SHOW CREATE VIEW
|
|
|
|
Shutdown Server Admin To shut down the server
|
|
|
|
Super Server Admin To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
|
|
|
|
Update Tables To update existing rows
|
|
|
|
Usage Server Admin No privileges - allow connect only
|
|
|
|
Variable_name Value
|
|
|
|
Tables_in_test (foo)
|
|
|
|
Variable_name Value
|
|
|
|
Level Code Message
|
|
|
|
drop procedure bug4902|
|
|
|
|
drop procedure if exists bug4904|
|
|
|
|
create procedure bug4904()
|
2005-02-18 17:39:32 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare continue handler for sqlstate 'HY000' begin end;
|
|
|
|
create table t2 as select * from t3;
|
2005-02-18 17:39:32 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
call bug4904()|
|
|
|
|
ERROR 42S02: Table 'test.t3' doesn't exist
|
|
|
|
drop procedure bug4904|
|
|
|
|
create table t3 (s1 char character set latin1, s2 char character set latin2)|
|
|
|
|
drop procedure if exists bug4904|
|
|
|
|
create procedure bug4904 ()
|
2005-02-25 13:19:44 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare continue handler for sqlstate 'HY000' begin end;
|
|
|
|
select s1 from t3 union select s2 from t3;
|
2005-02-25 13:19:44 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
call bug4904()|
|
|
|
|
drop procedure bug4904|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure if exists bug336|
|
|
|
|
create procedure bug336(out y int)
|
2005-02-25 17:56:45 +01:00
|
|
|
begin
|
|
|
|
declare x int;
|
2005-03-07 17:16:37 +01:00
|
|
|
set x = (select sum(t.data) from test.t1 t);
|
|
|
|
set y = x;
|
2005-02-25 17:56:45 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
insert into t1 values ("a", 2), ("b", 3)|
|
|
|
|
call bug336(@y)|
|
|
|
|
select @y|
|
|
|
|
@y
|
|
|
|
5
|
2005-02-25 17:56:45 +01:00
|
|
|
delete from t1|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop procedure bug336|
|
|
|
|
drop procedure if exists bug3157|
|
|
|
|
create procedure bug3157()
|
2003-03-03 15:03:19 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
if exists(select * from t1) then
|
|
|
|
set @n= @n + 1;
|
|
|
|
end if;
|
|
|
|
if (select count(*) from t1) then
|
|
|
|
set @n= @n + 1;
|
2003-03-03 15:03:19 +01:00
|
|
|
end if;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
set @n = 0|
|
|
|
|
insert into t1 values ("a", 1)|
|
|
|
|
call bug3157()|
|
|
|
|
select @n|
|
|
|
|
@n
|
|
|
|
2
|
|
|
|
delete from t1|
|
|
|
|
drop procedure bug3157|
|
|
|
|
drop procedure if exists bug5251|
|
|
|
|
create procedure bug5251()
|
2003-03-06 19:16:46 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
end|
|
|
|
|
select created into @c1 from mysql.proc
|
|
|
|
where db='test' and name='bug5251'|
|
|
|
|
alter procedure bug5251 comment 'foobar'|
|
|
|
|
select count(*) from mysql.proc
|
|
|
|
where db='test' and name='bug5251' and created = @c1|
|
|
|
|
count(*)
|
|
|
|
1
|
|
|
|
drop procedure bug5251|
|
|
|
|
drop procedure if exists bug5251|
|
|
|
|
create procedure bug5251()
|
|
|
|
checksum table t1|
|
|
|
|
call bug5251()|
|
|
|
|
Table Checksum
|
|
|
|
test.t1 0
|
|
|
|
call bug5251()|
|
|
|
|
Table Checksum
|
|
|
|
test.t1 0
|
|
|
|
drop procedure bug5251|
|
|
|
|
drop procedure if exists bug5287|
|
|
|
|
create procedure bug5287(param1 int)
|
|
|
|
label1:
|
2003-03-06 19:16:46 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare c cursor for select 5;
|
|
|
|
loop
|
|
|
|
if param1 >= 0 then
|
|
|
|
leave label1;
|
2003-03-06 19:16:46 +01:00
|
|
|
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|
|
2005-03-07 17:16:37 +01:00
|
|
|
call bug5287(1)|
|
|
|
|
drop procedure bug5287|
|
|
|
|
drop procedure if exists bug5307|
|
|
|
|
create procedure bug5307()
|
2003-03-06 19:16:46 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
end; set @x = 3|
|
|
|
|
call bug5307()|
|
|
|
|
select @x|
|
|
|
|
@x
|
|
|
|
3
|
|
|
|
drop procedure bug5307|
|
|
|
|
drop procedure if exists bug5258|
|
|
|
|
create procedure bug5258()
|
2003-03-06 19:16:46 +01:00
|
|
|
begin
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop procedure if exists bug5258_aux|
|
|
|
|
create procedure bug5258_aux()
|
2003-11-17 18:21:36 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare c, m char(19);
|
|
|
|
select created,modified into c,m from mysql.proc where name = 'bug5258';
|
|
|
|
if c = m then
|
|
|
|
select 'Ok';
|
2003-11-17 18:21:36 +01:00
|
|
|
else
|
2005-03-07 17:16:37 +01:00
|
|
|
select c, m;
|
2003-11-17 18:21:36 +01:00
|
|
|
end if;
|
2005-03-07 17:16:37 +01:00
|
|
|
end|
|
|
|
|
call bug5258_aux()|
|
|
|
|
Ok
|
|
|
|
Ok
|
|
|
|
drop procedure bug5258|
|
|
|
|
drop procedure bug5258_aux|
|
|
|
|
drop function if exists bug4487|
|
|
|
|
create function bug4487() returns char
|
|
|
|
begin
|
|
|
|
declare v char;
|
|
|
|
return v;
|
|
|
|
end|
|
|
|
|
select bug4487()|
|
|
|
|
bug4487()
|
|
|
|
NULL
|
|
|
|
drop function bug4487|
|
|
|
|
drop procedure if exists bug4941|
|
|
|
|
drop procedure if exists bug4941|
|
|
|
|
create procedure bug4941(out x int)
|
|
|
|
begin
|
|
|
|
declare c cursor for select i from t2 limit 1;
|
|
|
|
open c;
|
|
|
|
fetch c into x;
|
|
|
|
close c;
|
|
|
|
end|
|
|
|
|
insert into t2 values (null, null, null)|
|
|
|
|
set @x = 42|
|
|
|
|
call bug4941(@x)|
|
|
|
|
select @x|
|
|
|
|
@x
|
|
|
|
NULL
|
|
|
|
delete from t1|
|
|
|
|
drop procedure bug4941|
|
|
|
|
drop procedure if exists bug4905|
|
|
|
|
create table t3 (s1 int,primary key (s1))|
|
|
|
|
drop procedure if exists bug4905|
|
|
|
|
create procedure bug4905()
|
|
|
|
begin
|
|
|
|
declare v int;
|
|
|
|
declare continue handler for sqlstate '23000' set v = 5;
|
|
|
|
insert into t3 values (1);
|
|
|
|
end|
|
|
|
|
call bug4905()|
|
|
|
|
select row_count()|
|
|
|
|
row_count()
|
|
|
|
1
|
|
|
|
call bug4905()|
|
|
|
|
select row_count()|
|
|
|
|
row_count()
|
|
|
|
0
|
|
|
|
call bug4905()|
|
|
|
|
select row_count()|
|
|
|
|
row_count()
|
|
|
|
0
|
|
|
|
select * from t3|
|
|
|
|
s1
|
|
|
|
1
|
|
|
|
drop procedure bug4905|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure if exists bug6029|
|
|
|
|
drop procedure if exists bug6029|
|
|
|
|
create procedure bug6029()
|
2003-12-05 18:52:33 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare exit handler for 1136 select '1136';
|
|
|
|
declare exit handler for sqlstate '23000' select 'sqlstate 23000';
|
|
|
|
declare continue handler for sqlexception select 'sqlexception';
|
|
|
|
insert into t3 values (1);
|
|
|
|
insert into t3 values (1,2);
|
|
|
|
end|
|
|
|
|
create table t3 (s1 int, primary key (s1))|
|
|
|
|
insert into t3 values (1)|
|
|
|
|
call bug6029()|
|
|
|
|
sqlstate 23000
|
|
|
|
sqlstate 23000
|
|
|
|
delete from t3|
|
|
|
|
call bug6029()|
|
|
|
|
1136
|
|
|
|
1136
|
|
|
|
drop procedure bug6029|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure if exists bug8540|
|
|
|
|
create procedure bug8540()
|
|
|
|
begin
|
|
|
|
declare x int default 1;
|
|
|
|
select x as y, x+0 as z;
|
|
|
|
end|
|
|
|
|
call bug8540()|
|
|
|
|
y z
|
|
|
|
1 1
|
|
|
|
drop procedure bug8540|
|
|
|
|
create table t3 (s1 int)|
|
|
|
|
drop procedure if exists bug6642|
|
|
|
|
create procedure bug6642()
|
|
|
|
select abs(count(s1)) from t3|
|
|
|
|
call bug6642()|
|
|
|
|
abs(count(s1))
|
|
|
|
0
|
|
|
|
call bug6642()|
|
|
|
|
abs(count(s1))
|
|
|
|
0
|
|
|
|
drop procedure bug6642|
|
|
|
|
insert into t3 values (0),(1)|
|
|
|
|
drop procedure if exists bug7013|
|
|
|
|
create procedure bug7013()
|
|
|
|
select s1,count(s1) from t3 group by s1 with rollup|
|
|
|
|
call bug7013()|
|
|
|
|
s1 count(s1)
|
|
|
|
0 1
|
|
|
|
1 1
|
|
|
|
NULL 2
|
|
|
|
call bug7013()|
|
|
|
|
s1 count(s1)
|
|
|
|
0 1
|
|
|
|
1 1
|
|
|
|
NULL 2
|
|
|
|
drop procedure bug7013|
|
|
|
|
drop table if exists t4|
|
|
|
|
create table t4 (
|
|
|
|
a mediumint(8) unsigned not null auto_increment,
|
|
|
|
b smallint(5) unsigned not null,
|
|
|
|
c char(32) not null,
|
|
|
|
primary key (a)
|
|
|
|
) engine=myisam default charset=latin1|
|
|
|
|
insert into t4 values (1, 2, 'oneword')|
|
|
|
|
insert into t4 values (2, 2, 'anotherword')|
|
|
|
|
drop procedure if exists bug7743|
|
|
|
|
create procedure bug7743 ( searchstring char(28) )
|
2003-12-05 18:52:33 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare var mediumint(8) unsigned;
|
|
|
|
select a into var from t4 where b = 2 and c = binary searchstring limit 1;
|
|
|
|
select var;
|
2003-12-16 18:09:22 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
call bug7743("oneword")|
|
|
|
|
var
|
2003-12-05 18:52:33 +01:00
|
|
|
1
|
2005-03-07 17:16:37 +01:00
|
|
|
call bug7743("OneWord")|
|
|
|
|
var
|
|
|
|
NULL
|
|
|
|
Warnings:
|
2006-01-17 19:10:47 +01:00
|
|
|
Warning 1329 No data - zero rows fetched, selected, or processed
|
2005-03-07 17:16:37 +01:00
|
|
|
call bug7743("anotherword")|
|
|
|
|
var
|
2003-12-05 18:52:33 +01:00
|
|
|
2
|
2005-03-07 17:16:37 +01:00
|
|
|
call bug7743("AnotherWord")|
|
|
|
|
var
|
|
|
|
NULL
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
Warnings:
|
2006-01-17 19:10:47 +01:00
|
|
|
Warning 1329 No data - zero rows fetched, selected, or processed
|
2005-03-07 17:16:37 +01:00
|
|
|
drop procedure bug7743|
|
|
|
|
drop table t4|
|
|
|
|
delete from t3|
|
|
|
|
insert into t3 values(1)|
|
|
|
|
drop procedure if exists bug7992_1|
|
|
|
|
Warnings:
|
|
|
|
Note 1305 PROCEDURE bug7992_1 does not exist
|
|
|
|
drop procedure if exists bug7992_2|
|
|
|
|
Warnings:
|
|
|
|
Note 1305 PROCEDURE bug7992_2 does not exist
|
|
|
|
create procedure bug7992_1()
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare i int;
|
|
|
|
select max(s1)+1 into i from t3;
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
create procedure bug7992_2()
|
|
|
|
insert into t3 (s1) select max(t4.s1)+1 from t3 as t4|
|
|
|
|
call bug7992_1()|
|
|
|
|
call bug7992_1()|
|
|
|
|
call bug7992_2()|
|
|
|
|
call bug7992_2()|
|
|
|
|
drop procedure bug7992_1|
|
|
|
|
drop procedure bug7992_2|
|
|
|
|
drop table t3|
|
|
|
|
create table t3 ( userid bigint(20) not null default 0 )|
|
|
|
|
drop procedure if exists bug8116|
|
|
|
|
create procedure bug8116(in _userid int)
|
|
|
|
select * from t3 where userid = _userid|
|
|
|
|
call bug8116(42)|
|
|
|
|
userid
|
|
|
|
call bug8116(42)|
|
|
|
|
userid
|
|
|
|
drop procedure bug8116|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure if exists bug6857|
|
|
|
|
create procedure bug6857(counter int)
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
declare t0, t1 int;
|
|
|
|
declare plus bool default 0;
|
|
|
|
set t0 = current_time();
|
|
|
|
while counter > 0 do
|
|
|
|
set counter = counter - 1;
|
|
|
|
end while;
|
|
|
|
set t1 = current_time();
|
|
|
|
if t1 > t0 then
|
|
|
|
set plus = 1;
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
end if;
|
2005-03-07 17:16:37 +01:00
|
|
|
select plus;
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop procedure bug6857|
|
|
|
|
drop procedure if exists bug8757|
|
|
|
|
create procedure bug8757()
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
declare c1 cursor for select data from t1 limit 1;
|
|
|
|
begin
|
|
|
|
declare y int;
|
|
|
|
declare c2 cursor for select i from t2 limit 1;
|
|
|
|
open c2;
|
|
|
|
fetch c2 into y;
|
|
|
|
close c2;
|
|
|
|
select 2,y;
|
|
|
|
end;
|
|
|
|
open c1;
|
|
|
|
fetch c1 into x;
|
|
|
|
close c1;
|
|
|
|
select 1,x;
|
|
|
|
end|
|
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
|
|
|
insert into t1 values ("x", 1)|
|
|
|
|
insert into t2 values ("y", 2, 0.0)|
|
|
|
|
call bug8757()|
|
|
|
|
2 y
|
|
|
|
2 2
|
|
|
|
1 x
|
|
|
|
1 1
|
|
|
|
delete from t1|
|
|
|
|
delete from t2|
|
|
|
|
drop procedure bug8757|
|
|
|
|
drop procedure if exists bug8762|
|
|
|
|
drop procedure if exists bug8762; create procedure bug8762() begin end|
|
|
|
|
drop procedure if exists bug8762; create procedure bug8762() begin end|
|
|
|
|
drop procedure bug8762|
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
drop function if exists bug5240|
|
|
|
|
create function bug5240 () returns int
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
declare c cursor for select data from t1 limit 1;
|
|
|
|
open c;
|
|
|
|
fetch c into x;
|
|
|
|
close c;
|
|
|
|
return x;
|
|
|
|
end|
|
|
|
|
delete from t1|
|
|
|
|
insert into t1 values ("answer", 42)|
|
|
|
|
select id, bug5240() from t1|
|
|
|
|
id bug5240()
|
Better approach for prelocking of tables for stored routines execution
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
mysql-test/r/lock.result:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/r/mysqldump.result:
Added dropping of view which is used in test to its beginning.
mysql-test/r/sp.result:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Replaced wrong results of test for bug #5240 with correct results after
fixing bug in handling of cursors.
mysql-test/t/lock.test:
Replaced wrong error code with the correct one after fixing bug in
SP-locking.
mysql-test/t/mysqldump.test:
Added dropping of view which is used in test to its beginning.
mysql-test/t/sp.test:
Added tests for improved SP-locking.
Temporarily disabled tests for SHOW PROCEDURE STATUS and alike
(Until Monty will allow to open mysql.proc under LOCK TABLES without
mentioning it in lock list).
Removed test for bug #1654 since we already test exactly this function
in one of SP-locking tests.
Removed comment about cursor's wrong behavior in test for bug #5240
after fixing bug which was its cause.
sql/item_func.cc:
Removed comment which is no longer true.
sql/mysql_priv.h:
Changed open_tables() signature.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sp.cc:
sp_find_procedure():
Added one more parameter which enforces cache only lookup.
sp_merge_hash():
Now uses its return value to indicate that first of two hashes changed
as result of merge.
sp_cache_routines():
This function caches all stored routines used in query now.
sql/sp.h:
- sp_find_procedure() now has one more parameter which enforces cache only
lookup.
- sp_merge_hash() now uses its return value to indicate that first of two
hashes changed as result of merge.
- sp_cache_routines() caches all stored routines now. So it does not need
third argument any more.
sql/sp_head.cc:
sp_head::sp_head():
Added initialization of new m_spfuns and m_spprocs members.
sp_head::execute():
Let us save/restore part of thread context which can be damaged by
execution of instructions.
sp_head::execute_function()/execute_procedure():
Now it is responsibility of caller to close tables used in
subqueries which are passed as routine parameters.
sp_head::restore_lex():
Let us accumulate information about routines used by this one
in new m_spfuns, m_spprocs hashes.
sp_lex_keeper::reset_lex_and_exec_core()
Main method of new auxilary sp_lex_keeper class to which instructions
delegate responsibility for handling LEX and preparations before
executing statement or calculating complex expression.
Since all instructions which calculate complex expression or execute
command now use sp_lex_keeper they have to implement
sp_instr::exec_core() method. Most of instruction specific logic
has moved from sp_instr::execute() to this new method.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sp_merge_table_list() became sp_head::merge_table_list() method. It
also treats sp_head::m_sptabs as multi-set of tables now.
sp_hash_to_table_list() became sp_head::add_used_tables_to_table_list().
It takes into account that sp_head::m_sptabs is multi-set and allocates
object into persistent arena of PS.
Removed sp_merge_table_hash(), sp_open_and_lock_tables(),
sp_unlock_tables(), sp_merge_routine_tables() methods since they are not
used by new prelocking mechanism.
Added sp_add_sp_tables_to_table_list() which serves for adding tables needed
by routines used in query to the query table list for prelocking.
sql/sp_head.h:
class sp_head:
- Added m_spfuns, m_spprocs members for storing names of routines used
by this routine.
- Added add_used_tables_to_table_list() method which allows to add
tables needed by this routine to query's table list.
- Converted sp_merge_table_list() to sp_head::merge_table_list() method.
- Changed semantics of THD::m_sptabs. Now it is multi-set which contains
only tables which are used by this routine and not routines that are
called from this one.
Removed sp_merge_routine_tables(), sp_merge_table_hash(),
sp_open_and_lock_tables(), sp_unlock_tables() calls since they are not
used for our prelocking list calculation.
Added auxilary sp_lex_keeper class to which instructions delegate
responsibility for handling LEX and preparations before executing
statement or calculating complex expression. This class uses
new sp_instr::exec_core() method which is responsible for executing
instruction's core function after all preparations were made.
All instructions which hold and calculate complex expression now have
their own LEX (by aggregating sp_lex_keeper instance). sp_instr_stmt
now uses sp_lex_keeper too.
Removed sp_instr_set_user_var class which is no longer used, because
nowdays we allow execution of statements in stored functions and
triggers.
sql/sp_rcontext.cc:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sp_rcontext.h:
Now sp_cursor holds pointer to sp_lex_keeper instead of LEX.
sql/sql_acl.cc:
acl_init(), grant_init():
Now we use simple_open_n_lock_tables() instead of explicit
calls to open_tables() and mysql_lock_tables().
sql/sql_base.cc:
Implemented support for execution of statements in "prelocked" mode.
When we have statement which uses stored routines explicitly or
implicitly (via views or triggers) we have to open and lock all tables
for these routines at the same time as tables for the main statement.
In fact we have to do implicit LOCK TABLES at the begining of such
statement and implict UNLOCK TABLES at its end. We call such mode
"prelocked".
When open_tables() is called for the statement tables which are needed
for execution of routines used by it are added to its tables list
(this process also caches all routines used). Implicit use of routines
is discovered when we open view or table with trigger and apropriate
tables are added to the table list at this moment. Statement which has
such extra tables in its list (well actually any that uses functions)
is marked as requiring prelocked mode for its execution.
When lock_tables() sees such statement it will issue implicit LOCK TABLES
for this extended table list instead of doing usual locking, it will also
set THD::prelocked_mode to indicate that we are in prelocked mode.
When open_tables()/lock_tables() are called for statement of stored
routine (substatement), they notice that we are running in prelocked mode
and use one of prelocked tables from those that are not used by upper
levels of execution.
close_thread_tables() for substatement won't really close tables used
but will mark them as free for reuse instead.
Finally when close_thread_tables() is called for the main statement it
really unlocks and closes all tables used.
Everything will work even if one uses such statement under real LOCK
TABLES (we are simply not doing implicit LOCK/UNLOCK in this case).
sql/sql_class.cc:
Added initialization of THD::prelocked_mode member.
sql/sql_class.h:
- Added prelocked_mode_type enum and THD::prelocked_mode member
which are used for indication whenever "prelocked mode" is on
(i.e. that statement uses stored routines and is executed under
implicit LOCK TABLES).
- Removed THD::shortcut_make_view which is no longer needed.
We use TABLE_LIST::prelocking_placeholder for the same purprose
now.
sql/sql_handler.cc:
Changed open_tables() invocation.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_lex.cc:
lex_start():
Added initialization of LEX::query_tables_own_last.
Unused LEX::sptabs member was removed.
st_lex::unlink_first_table()/link_first_table_back():
We should update LEX::query_tables_last properly if table list
contains(ed) only one element.
sql/sql_lex.h:
LEX:
- Removed sptabs member since it is no longer used.
- Added query_tables_own_last member, which if non-0 indicates that
statement requires prelocking (implicit LOCK TABLES) for its execution
and points to last own element in query table list. If it is zero
then this query does not need prelocking.
- Added requires_prelocking(), mark_as_requiring_prelocking(),
first_not_own_table() inline methods to incapsulate and simplify
usage of this new member.
sql/sql_parse.cc:
dispatch_command():
To properly leave prelocked mode when needed we should call
close_thread_tables() even if there are no open tables.
mysql_execute_command():
- Removed part of function which were responsible for doing implicit
LOCK TABLES before statement execution if statement used stored
routines (and doing UNLOCK TABLES at the end).
Now we do all this in open_tables()/lock_tables()/close_thread_tables()
instead.
- It is also sensible to reset errors before execution of statement
which uses routines.
- SQLCOM_DO, SQLCOM_SET_OPTION, SQLCOM_CALL
We should always try to open tables because even if statement has empty
table list, it can call routines using tables, which should be preopened
before statement execution.
- SQLCOM_CALL
We should not look up routine called in mysql.proc, since it should be
already cached by this moment by open_tables() call.
- SQLCOM_LOCK_TABLES
it is better to use simple_open_n_lock_tables() since we want to avoid
materialization of derived tables for this command.
sql/sql_prepare.cc:
mysql_test_update():
Changed open_tables() invocations. Now its 2nd parameter is in/out
since it can add elements to table list.
check_prepared_statement():
Since now we cache all routines used by statement in open_tables() we
don't need to do it explicitly.
mysql_stmt_prepare():
Now we should call close_thread_tables() when THD::lex points to the
LEX of statement which opened tables.
reset_stmt_for_execute():
Commented why we are resetting all tables in table list.
sql/sql_trigger.h:
Table_triggers_list::process_triggers():
We should surpress sending of ok packet when we are calling trigger's
routine, since now we allow statements in them.
sql/sql_update.cc:
Changed open_tables() invocations.
Now its 2nd parameter is in/out since it can add elements to table list.
sql/sql_view.cc:
mysql_make_view():
- Removed handling of routines used in view. Instead we add tables which
are needed for their execution to statement's table list in
open_tables().
- Now we use TABLE_LIST::prelocking_placeholder instead of
THD::shortcut_make_view for indicating that view is opened
only to discover which tables and routines it uses (this happens
when we build extended table list for prelocking). Also now we try
to avoid to modify main LEX in this case (except of its table list).
- Corrected small error we added tables to the table list of the main
LEX without updating its query_tables_last member properly.
sql/sql_yacc.yy:
Now each expression which is used in SP statements and can contain
subquery has its own LEX. This LEX is stored in corresponding sp_instr
object and used along with Item tree for expression calculation.
We don't need sp_instr_set_user_var() anymore since now we allow
execution of statements in stored functions and triggers.
sql/table.h:
Added TABLE_LIST::prelocking_placeholder member for distinguishing
elements of table list which does not belong to the statement itself
and added there only for prelocking (as they are to be used by routines
called by this statement).
sql/tztime.cc:
my_tz_init():
Now we use more simplier simple_open_n_lock_tables() call instead of
open_tables()/lock_tables() pair.
2005-03-04 14:35:28 +01:00
|
|
|
answer 42
|
WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
mysql-test/r/information_schema.result:
Updated result for WL#2130.
mysql-test/r/lock.result:
Updated result for WL#2130.
mysql-test/r/sp-error.result:
Updated result for WL#2130.
mysql-test/r/sp.result:
Updated result for WL#2130.
mysql-test/r/view.result:
Updated result for WL#2130.
mysql-test/t/information_schema.test:
Disabled one test case due to a bug involving LOCK TABLES,
which shows up with WL#2130.
mysql-test/t/lock.test:
New error message with WL#2130. This change is under debate and might change
in the future, but will do for now.
mysql-test/t/sp-error.test:
Updated for WL#2130. Some tests are voided when table access does work from
functions.
mysql-test/t/sp.test:
Updated for WL#2130.
mysql-test/t/view.test:
Updated for WL#2130.
sql/item_func.cc:
We now have to set net.no_send_ok for functions too, with WL#2130.
sql/share/errmsg.txt:
Reused an error code since the old use was voided by WL#2130, but a new
one was needed instead (similar, but more specific restriction).
sql/sp.cc:
Fixed error handling and collection of used tables for WL#2130.
sql/sp.h:
Fixed error handling and collection of used tables for WL#2130.
sql/sp_head.cc:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sp_head.h:
Added support functions for collecting and merging hash tables and lists
of used tables from SPs and substatements, for WL#2130.
sql/sql_base.cc:
Changed the way table->query_id is tested and set during with locked tables
in effect. This makes some SP test cases work with WL#2130, but has a side
effect on some error cases with explicit LOCK TABLES. It's still debated if
this is the correct way, so it might change.
sql/sql_class.h:
Added flags for circumventing some interference between WL#2130 and mysql_make_view().
sql/sql_derived.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_lex.cc:
Clear the new hash tables for WL#2130.
sql/sql_lex.h:
Added hash tables for procedures and tables too (as for functions), for WL#2130.
sql/sql_parse.cc:
WL#2130: Make table accesses from stored functions work by adding an implicit
LOCK TABLES around (most) executed statements. To do this, we have to go through
a loop where we collect all SPs and tables in mysql_execute_statement.
sql/sql_prepare.cc:
Cache both functions and procedures for WL#2130.
sql/sql_show.cc:
Added some missing initializations. (Potential bugs.)
sql/sql_view.cc:
Shortcut mysql_make_view() if thd->shortcut_make_view is true during
the pre-open phase for collecting tables in WL#2130. Otherwise, the
similar mechanism here causes interference.
sql/sql_yacc.yy:
For WL#2130, added caching of procedures and disallowed LOCK/UNLOCK TABLES in SPs.
2005-02-08 20:52:50 +01:00
|
|
|
drop function bug5240|
|
2005-02-09 15:02:37 +01:00
|
|
|
drop procedure if exists p1|
|
|
|
|
create table t3(id int)|
|
|
|
|
insert into t3 values(1)|
|
|
|
|
create procedure bug7992()
|
2005-01-20 16:04:24 +01:00
|
|
|
begin
|
|
|
|
declare i int;
|
2005-02-09 15:02:37 +01:00
|
|
|
select max(id)+1 into i from t3;
|
|
|
|
end|
|
|
|
|
call bug7992()|
|
|
|
|
call bug7992()|
|
|
|
|
drop procedure bug7992|
|
|
|
|
drop table t3|
|
2005-03-07 17:16:37 +01:00
|
|
|
create table t3 (
|
|
|
|
lpitnumber int(11) default null,
|
|
|
|
lrecordtype int(11) default null
|
|
|
|
)|
|
|
|
|
create table t4 (
|
|
|
|
lbsiid int(11) not null default '0',
|
|
|
|
ltradingmodeid int(11) not null default '0',
|
|
|
|
ltradingareaid int(11) not null default '0',
|
|
|
|
csellingprice decimal(19,4) default null,
|
|
|
|
primary key (lbsiid,ltradingmodeid,ltradingareaid)
|
|
|
|
)|
|
|
|
|
create table t5 (
|
|
|
|
lbsiid int(11) not null default '0',
|
|
|
|
ltradingareaid int(11) not null default '0',
|
|
|
|
primary key (lbsiid,ltradingareaid)
|
|
|
|
)|
|
|
|
|
drop procedure if exists bug8849|
|
|
|
|
create procedure bug8849()
|
2005-03-03 15:38:59 +01:00
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
insert into t5
|
2005-03-03 15:38:59 +01:00
|
|
|
(
|
2005-03-07 17:16:37 +01:00
|
|
|
t5.lbsiid,
|
|
|
|
t5.ltradingareaid
|
2005-03-03 15:38:59 +01:00
|
|
|
)
|
2005-03-07 17:16:37 +01:00
|
|
|
select distinct t3.lpitnumber, t4.ltradingareaid
|
2005-03-03 15:38:59 +01:00
|
|
|
from
|
2005-03-07 17:16:37 +01:00
|
|
|
t4 join t3 on
|
|
|
|
t3.lpitnumber = t4.lbsiid
|
|
|
|
and t3.lrecordtype = 1
|
|
|
|
left join t4 as price01 on
|
|
|
|
price01.lbsiid = t4.lbsiid and
|
2005-03-03 15:38:59 +01:00
|
|
|
price01.ltradingmodeid = 1 and
|
2005-03-07 17:16:37 +01:00
|
|
|
t4.ltradingareaid = price01.ltradingareaid;
|
|
|
|
end|
|
|
|
|
call bug8849()|
|
|
|
|
call bug8849()|
|
|
|
|
call bug8849()|
|
|
|
|
drop procedure bug8849|
|
|
|
|
drop tables t3,t4,t5|
|
2005-03-07 18:09:53 +01:00
|
|
|
drop procedure if exists bug8937|
|
|
|
|
create procedure bug8937()
|
|
|
|
begin
|
|
|
|
declare s,x,y,z int;
|
|
|
|
declare a float;
|
|
|
|
select sum(data),avg(data),min(data),max(data) into s,x,y,z from t1;
|
|
|
|
select s,x,y,z;
|
|
|
|
select avg(data) into a from t1;
|
|
|
|
select a;
|
|
|
|
end|
|
|
|
|
delete from t1|
|
|
|
|
insert into t1 (data) values (1), (2), (3), (4), (6)|
|
|
|
|
call bug8937()|
|
|
|
|
s x y z
|
|
|
|
16 3 1 6
|
|
|
|
a
|
2005-12-07 15:01:17 +01:00
|
|
|
3.2
|
2005-03-07 18:09:53 +01:00
|
|
|
drop procedure bug8937|
|
|
|
|
delete from t1|
|
2005-04-08 17:31:37 +02:00
|
|
|
drop procedure if exists bug6900|
|
|
|
|
drop procedure if exists bug9074|
|
|
|
|
drop procedure if exists bug6900_9074|
|
|
|
|
create table t3 (w char unique, x char)|
|
|
|
|
insert into t3 values ('a', 'b')|
|
|
|
|
create procedure bug6900()
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlexception select '1';
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlexception select '2';
|
|
|
|
insert into t3 values ('x', 'y', 'z');
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure bug9074()
|
|
|
|
begin
|
|
|
|
declare x1, x2, x3, x4, x5, x6 int default 0;
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlstate '23000' set x5 = 1;
|
|
|
|
insert into t3 values ('a', 'b');
|
|
|
|
set x6 = 1;
|
|
|
|
end;
|
|
|
|
begin1_label:
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlstate '23000' set x1 = 1;
|
|
|
|
insert into t3 values ('a', 'b');
|
|
|
|
set x2 = 1;
|
|
|
|
begin2_label:
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlstate '23000' set x3 = 1;
|
|
|
|
set x4= 1;
|
|
|
|
insert into t3 values ('a','b');
|
|
|
|
set x4= 0;
|
|
|
|
end begin2_label;
|
|
|
|
end begin1_label;
|
|
|
|
select x1, x2, x3, x4, x5, x6;
|
|
|
|
end|
|
|
|
|
create procedure bug6900_9074(z int)
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlstate '23000' select '23000';
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlexception select 'sqlexception';
|
|
|
|
if z = 1 then
|
|
|
|
insert into t3 values ('a', 'b');
|
|
|
|
else
|
|
|
|
insert into t3 values ('x', 'y', 'z');
|
|
|
|
end if;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
call bug6900()|
|
|
|
|
2
|
|
|
|
2
|
|
|
|
call bug9074()|
|
|
|
|
x1 x2 x3 x4 x5 x6
|
|
|
|
1 1 1 1 1 1
|
|
|
|
call bug6900_9074(0)|
|
|
|
|
sqlexception
|
|
|
|
sqlexception
|
|
|
|
call bug6900_9074(1)|
|
|
|
|
23000
|
|
|
|
23000
|
|
|
|
drop procedure bug6900|
|
|
|
|
drop procedure bug9074|
|
|
|
|
drop procedure bug6900_9074|
|
|
|
|
drop table t3|
|
2005-04-12 15:43:24 +02:00
|
|
|
drop procedure if exists avg|
|
|
|
|
create procedure avg ()
|
|
|
|
begin
|
|
|
|
end|
|
|
|
|
call avg ()|
|
|
|
|
drop procedure avg|
|
2005-04-13 16:09:28 +02:00
|
|
|
drop procedure if exists bug6129|
|
2005-07-16 14:10:42 +02:00
|
|
|
set @old_mode= @@sql_mode;
|
2005-07-29 22:39:08 +02:00
|
|
|
set @@sql_mode= "ERROR_FOR_DIVISION_BY_ZERO";
|
2005-07-16 14:10:42 +02:00
|
|
|
create procedure bug6129()
|
|
|
|
select @@sql_mode|
|
|
|
|
call bug6129()|
|
|
|
|
@@sql_mode
|
2005-07-29 22:39:08 +02:00
|
|
|
ERROR_FOR_DIVISION_BY_ZERO
|
2005-07-16 14:10:42 +02:00
|
|
|
set @@sql_mode= "NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO"|
|
|
|
|
call bug6129()|
|
|
|
|
@@sql_mode
|
2005-07-29 22:39:08 +02:00
|
|
|
ERROR_FOR_DIVISION_BY_ZERO
|
2005-07-16 14:10:42 +02:00
|
|
|
set @@sql_mode= "NO_ZERO_IN_DATE"|
|
|
|
|
call bug6129()|
|
|
|
|
@@sql_mode
|
2005-07-29 22:39:08 +02:00
|
|
|
ERROR_FOR_DIVISION_BY_ZERO
|
2005-07-16 14:10:42 +02:00
|
|
|
set @@sql_mode=@old_mode;
|
2005-04-13 16:09:28 +02:00
|
|
|
drop procedure bug6129|
|
2005-04-13 16:57:49 +02:00
|
|
|
drop procedure if exists bug9856|
|
|
|
|
create procedure bug9856()
|
|
|
|
begin
|
|
|
|
declare v int;
|
|
|
|
declare c cursor for select data from t1;
|
|
|
|
declare exit handler for sqlexception, not found select '16';
|
|
|
|
open c;
|
|
|
|
fetch c into v;
|
|
|
|
select v;
|
|
|
|
end|
|
|
|
|
delete from t1|
|
|
|
|
call bug9856()|
|
|
|
|
16
|
|
|
|
16
|
|
|
|
call bug9856()|
|
|
|
|
16
|
|
|
|
16
|
|
|
|
drop procedure bug9856|
|
2005-04-13 17:43:53 +02:00
|
|
|
drop procedure if exists bug9674_1|
|
|
|
|
drop procedure if exists bug9674_2|
|
|
|
|
create procedure bug9674_1(out arg int)
|
|
|
|
begin
|
|
|
|
declare temp_in1 int default 0;
|
|
|
|
declare temp_fl1 int default 0;
|
|
|
|
set temp_in1 = 100;
|
|
|
|
set temp_fl1 = temp_in1/10;
|
|
|
|
set arg = temp_fl1;
|
|
|
|
end|
|
|
|
|
create procedure bug9674_2()
|
|
|
|
begin
|
|
|
|
declare v int default 100;
|
|
|
|
select v/10;
|
|
|
|
end|
|
|
|
|
call bug9674_1(@sptmp)|
|
|
|
|
call bug9674_1(@sptmp)|
|
|
|
|
select @sptmp|
|
|
|
|
@sptmp
|
|
|
|
10
|
|
|
|
call bug9674_2()|
|
|
|
|
v/10
|
2005-05-05 22:01:39 +02:00
|
|
|
10.0000
|
2005-04-13 17:43:53 +02:00
|
|
|
call bug9674_2()|
|
|
|
|
v/10
|
2005-05-05 22:01:39 +02:00
|
|
|
10.0000
|
2005-04-13 17:43:53 +02:00
|
|
|
drop procedure bug9674_1|
|
|
|
|
drop procedure bug9674_2|
|
2005-04-14 14:52:35 +02:00
|
|
|
drop procedure if exists bug9598_1|
|
|
|
|
drop procedure if exists bug9598_2|
|
|
|
|
create procedure bug9598_1(in var_1 char(16),
|
|
|
|
out var_2 integer, out var_3 integer)
|
|
|
|
begin
|
|
|
|
set var_2 = 50;
|
|
|
|
set var_3 = 60;
|
|
|
|
end|
|
|
|
|
create procedure bug9598_2(in v1 char(16),
|
|
|
|
in v2 integer,
|
|
|
|
in v3 integer,
|
|
|
|
in v4 integer,
|
|
|
|
in v5 integer)
|
|
|
|
begin
|
|
|
|
select v1,v2,v3,v4,v5;
|
|
|
|
call bug9598_1(v1,@tmp1,@tmp2);
|
|
|
|
select v1,v2,v3,v4,v5;
|
|
|
|
end|
|
|
|
|
call bug9598_2('Test',2,3,4,5)|
|
|
|
|
v1 v2 v3 v4 v5
|
|
|
|
Test 2 3 4 5
|
|
|
|
v1 v2 v3 v4 v5
|
|
|
|
Test 2 3 4 5
|
|
|
|
select @tmp1, @tmp2|
|
|
|
|
@tmp1 @tmp2
|
|
|
|
50 60
|
|
|
|
drop procedure bug9598_1|
|
|
|
|
drop procedure bug9598_2|
|
2005-04-15 11:06:25 +02:00
|
|
|
drop procedure if exists bug9902|
|
|
|
|
create function bug9902() returns int(11)
|
|
|
|
begin
|
|
|
|
set @x = @x + 1;
|
|
|
|
return @x;
|
|
|
|
end|
|
|
|
|
set @qcs1 = @@query_cache_size|
|
|
|
|
set global query_cache_size = 100000|
|
|
|
|
set @x = 1|
|
|
|
|
insert into t1 values ("qc", 42)|
|
|
|
|
select bug9902() from t1|
|
|
|
|
bug9902()
|
|
|
|
2
|
|
|
|
select bug9902() from t1|
|
|
|
|
bug9902()
|
|
|
|
3
|
|
|
|
select @x|
|
|
|
|
@x
|
|
|
|
3
|
|
|
|
set global query_cache_size = @qcs1|
|
|
|
|
delete from t1|
|
|
|
|
drop function bug9902|
|
2005-04-19 10:09:25 +02:00
|
|
|
drop function if exists bug9102|
|
|
|
|
create function bug9102() returns blob return 'a'|
|
2005-04-20 19:08:42 +02:00
|
|
|
select bug9102()|
|
2005-04-19 10:09:25 +02:00
|
|
|
bug9102()
|
|
|
|
a
|
2005-04-20 19:08:42 +02:00
|
|
|
drop function bug9102|
|
|
|
|
drop function if exists bug7648|
|
2005-04-19 11:51:11 +02:00
|
|
|
create function bug7648() returns bit(8) return 'a'|
|
|
|
|
select bug7648()|
|
|
|
|
bug7648()
|
|
|
|
a
|
|
|
|
drop function bug7648|
|
2005-04-20 19:08:42 +02:00
|
|
|
drop function if exists bug9775|
|
|
|
|
create function bug9775(v1 char(1)) returns enum('a','b') return v1|
|
|
|
|
select bug9775('a'),bug9775('b'),bug9775('c')|
|
|
|
|
bug9775('a') bug9775('b') bug9775('c')
|
|
|
|
a b
|
2005-12-07 15:01:17 +01:00
|
|
|
Warnings:
|
|
|
|
Warning 1265 Data truncated for column 'bug9775('c')' at row 1
|
2005-04-20 19:08:42 +02:00
|
|
|
drop function bug9775|
|
|
|
|
create function bug9775(v1 int) returns enum('a','b') return v1|
|
|
|
|
select bug9775(1),bug9775(2),bug9775(3)|
|
|
|
|
bug9775(1) bug9775(2) bug9775(3)
|
|
|
|
a b
|
2005-12-07 15:01:17 +01:00
|
|
|
Warnings:
|
|
|
|
Warning 1265 Data truncated for column 'bug9775(3)' at row 1
|
2005-04-20 19:08:42 +02:00
|
|
|
drop function bug9775|
|
|
|
|
create function bug9775(v1 char(1)) returns set('a','b') return v1|
|
|
|
|
select bug9775('a'),bug9775('b'),bug9775('a,b'),bug9775('c')|
|
|
|
|
bug9775('a') bug9775('b') bug9775('a,b') bug9775('c')
|
2005-12-07 15:01:17 +01:00
|
|
|
a b a
|
|
|
|
Warnings:
|
|
|
|
Warning 1265 Data truncated for column 'v1' at row 1
|
|
|
|
Warning 1265 Data truncated for column 'bug9775('c')' at row 1
|
2005-04-20 19:08:42 +02:00
|
|
|
drop function bug9775|
|
|
|
|
create function bug9775(v1 int) returns set('a','b') return v1|
|
|
|
|
select bug9775(1),bug9775(2),bug9775(3),bug9775(4)|
|
|
|
|
bug9775(1) bug9775(2) bug9775(3) bug9775(4)
|
|
|
|
a b a,b
|
2005-12-07 15:01:17 +01:00
|
|
|
Warnings:
|
|
|
|
Warning 1265 Data truncated for column 'bug9775(4)' at row 1
|
2005-04-20 19:08:42 +02:00
|
|
|
drop function bug9775|
|
2005-04-21 14:22:47 +02:00
|
|
|
drop function if exists bug8861|
|
|
|
|
create function bug8861(v1 int) returns year return v1|
|
|
|
|
select bug8861(05)|
|
|
|
|
bug8861(05)
|
|
|
|
2005
|
|
|
|
set @x = bug8861(05)|
|
|
|
|
select @x|
|
|
|
|
@x
|
|
|
|
2005
|
|
|
|
drop function bug8861|
|
2005-04-22 12:53:48 +02:00
|
|
|
drop procedure if exists bug9004_1|
|
|
|
|
drop procedure if exists bug9004_2|
|
|
|
|
create procedure bug9004_1(x char(16))
|
|
|
|
begin
|
|
|
|
insert into t1 values (x, 42);
|
|
|
|
insert into t1 values (x, 17);
|
|
|
|
end|
|
|
|
|
create procedure bug9004_2(x char(16))
|
|
|
|
call bug9004_1(x)|
|
|
|
|
call bug9004_1('12345678901234567')|
|
|
|
|
Warnings:
|
2005-12-07 15:01:17 +01:00
|
|
|
Warning 1265 Data truncated for column 'x' at row 1
|
2005-04-22 12:53:48 +02:00
|
|
|
call bug9004_2('12345678901234567890')|
|
|
|
|
Warnings:
|
2005-12-07 15:01:17 +01:00
|
|
|
Warning 1265 Data truncated for column 'x' at row 1
|
2005-04-22 12:53:48 +02:00
|
|
|
delete from t1|
|
|
|
|
drop procedure bug9004_1|
|
|
|
|
drop procedure bug9004_2|
|
2005-04-28 23:46:54 +02:00
|
|
|
drop procedure if exists bug7293|
|
|
|
|
insert into t1 values ('secret', 0)|
|
|
|
|
create procedure bug7293(p1 varchar(100))
|
|
|
|
begin
|
|
|
|
if exists (select id from t1 where soundex(p1)=soundex(id)) then
|
|
|
|
select 'yes';
|
|
|
|
end if;
|
|
|
|
end;|
|
|
|
|
call bug7293('secret')|
|
|
|
|
yes
|
|
|
|
yes
|
|
|
|
call bug7293 ('secrete')|
|
|
|
|
yes
|
|
|
|
yes
|
|
|
|
drop procedure bug7293|
|
|
|
|
delete from t1|
|
2005-05-05 17:49:15 +02:00
|
|
|
drop procedure if exists bug9841|
|
|
|
|
drop view if exists v1|
|
|
|
|
create view v1 as select * from t1, t2 where id = s|
|
|
|
|
create procedure bug9841 ()
|
|
|
|
update v1 set data = 10|
|
|
|
|
call bug9841()|
|
|
|
|
drop view v1|
|
|
|
|
drop procedure bug9841|
|
2005-05-09 00:59:10 +02:00
|
|
|
drop procedure if exists bug5963|
|
|
|
|
create procedure bug5963_1 () begin declare v int; set v = (select s1 from t3); select v; end;|
|
|
|
|
create table t3 (s1 int)|
|
|
|
|
insert into t3 values (5)|
|
|
|
|
call bug5963_1()|
|
|
|
|
v
|
|
|
|
5
|
|
|
|
call bug5963_1()|
|
|
|
|
v
|
|
|
|
5
|
|
|
|
drop procedure bug5963_1|
|
|
|
|
drop table t3|
|
|
|
|
create procedure bug5963_2 (cfk_value int)
|
|
|
|
begin
|
|
|
|
if cfk_value in (select cpk from t3) then
|
|
|
|
set @x = 5;
|
|
|
|
end if;
|
|
|
|
end;
|
|
|
|
|
|
|
|
|
create table t3 (cpk int)|
|
|
|
|
insert into t3 values (1)|
|
|
|
|
call bug5963_2(1)|
|
|
|
|
call bug5963_2(1)|
|
|
|
|
drop procedure bug5963_2|
|
|
|
|
drop table t3|
|
2005-05-27 14:48:33 +02:00
|
|
|
drop function if exists bug9559|
|
|
|
|
create function bug9559()
|
|
|
|
returns int
|
|
|
|
begin
|
|
|
|
set @y = -6/2;
|
|
|
|
return @y;
|
|
|
|
end|
|
|
|
|
select bug9559()|
|
|
|
|
bug9559()
|
|
|
|
-3
|
|
|
|
drop function bug9559|
|
2005-06-01 12:18:41 +02:00
|
|
|
drop procedure if exists bug10961|
|
|
|
|
create procedure bug10961()
|
|
|
|
begin
|
|
|
|
declare v char;
|
|
|
|
declare x int;
|
|
|
|
declare c cursor for select * from dual;
|
|
|
|
declare continue handler for sqlexception select x;
|
|
|
|
set x = 1;
|
|
|
|
open c;
|
|
|
|
set x = 2;
|
|
|
|
fetch c into v;
|
|
|
|
set x = 3;
|
|
|
|
close c;
|
|
|
|
end|
|
|
|
|
call bug10961()|
|
|
|
|
x
|
|
|
|
1
|
|
|
|
x
|
|
|
|
2
|
|
|
|
x
|
|
|
|
3
|
|
|
|
call bug10961()|
|
|
|
|
x
|
|
|
|
1
|
|
|
|
x
|
|
|
|
2
|
|
|
|
x
|
|
|
|
3
|
|
|
|
drop procedure bug10961|
|
2005-06-06 15:05:11 +02:00
|
|
|
DROP PROCEDURE IF EXISTS bug6866|
|
|
|
|
DROP VIEW IF EXISTS tv|
|
|
|
|
Warnings:
|
|
|
|
Note 1051 Unknown table 'test.tv'
|
|
|
|
DROP TABLE IF EXISTS tt1,tt2,tt3|
|
|
|
|
Warnings:
|
|
|
|
Note 1051 Unknown table 'tt1'
|
|
|
|
Note 1051 Unknown table 'tt2'
|
|
|
|
Note 1051 Unknown table 'tt3'
|
|
|
|
CREATE TABLE tt1 (a1 int, a2 int, a3 int, data varchar(10))|
|
|
|
|
CREATE TABLE tt2 (a2 int, data2 varchar(10))|
|
|
|
|
CREATE TABLE tt3 (a3 int, data3 varchar(10))|
|
|
|
|
INSERT INTO tt1 VALUES (1, 1, 4, 'xx')|
|
|
|
|
INSERT INTO tt2 VALUES (1, 'a')|
|
|
|
|
INSERT INTO tt2 VALUES (2, 'b')|
|
|
|
|
INSERT INTO tt2 VALUES (3, 'c')|
|
|
|
|
INSERT INTO tt3 VALUES (4, 'd')|
|
|
|
|
INSERT INTO tt3 VALUES (5, 'e')|
|
|
|
|
INSERT INTO tt3 VALUES (6, 'f')|
|
|
|
|
CREATE VIEW tv AS
|
|
|
|
SELECT tt1.*, tt2.data2, tt3.data3
|
|
|
|
FROM tt1 INNER JOIN tt2 ON tt1.a2 = tt2.a2
|
|
|
|
LEFT JOIN tt3 ON tt1.a3 = tt3.a3
|
|
|
|
ORDER BY tt1.a1, tt2.a2, tt3.a3|
|
|
|
|
CREATE PROCEDURE bug6866 (_a1 int)
|
|
|
|
BEGIN
|
|
|
|
SELECT * FROM tv WHERE a1 = _a1;
|
|
|
|
END|
|
|
|
|
CALL bug6866(1)|
|
|
|
|
a1 a2 a3 data data2 data3
|
|
|
|
1 1 4 xx a d
|
|
|
|
CALL bug6866(1)|
|
|
|
|
a1 a2 a3 data data2 data3
|
|
|
|
1 1 4 xx a d
|
|
|
|
CALL bug6866(1)|
|
|
|
|
a1 a2 a3 data data2 data3
|
|
|
|
1 1 4 xx a d
|
|
|
|
DROP PROCEDURE bug6866;
|
|
|
|
DROP VIEW tv|
|
|
|
|
DROP TABLE tt1, tt2, tt3|
|
2005-06-21 23:17:08 +02:00
|
|
|
DROP PROCEDURE IF EXISTS bug10136|
|
|
|
|
create table t3 ( name char(5) not null primary key, val float not null)|
|
|
|
|
insert into t3 values ('aaaaa', 1), ('bbbbb', 2), ('ccccc', 3)|
|
|
|
|
create procedure bug10136()
|
|
|
|
begin
|
|
|
|
declare done int default 3;
|
|
|
|
repeat
|
|
|
|
select * from t3;
|
|
|
|
set done = done - 1;
|
|
|
|
until done <= 0 end repeat;
|
|
|
|
end|
|
|
|
|
call bug10136()|
|
|
|
|
name val
|
|
|
|
aaaaa 1
|
|
|
|
bbbbb 2
|
|
|
|
ccccc 3
|
|
|
|
name val
|
|
|
|
aaaaa 1
|
|
|
|
bbbbb 2
|
|
|
|
ccccc 3
|
|
|
|
name val
|
|
|
|
aaaaa 1
|
|
|
|
bbbbb 2
|
|
|
|
ccccc 3
|
|
|
|
call bug10136()|
|
|
|
|
name val
|
|
|
|
aaaaa 1
|
|
|
|
bbbbb 2
|
|
|
|
ccccc 3
|
|
|
|
name val
|
|
|
|
aaaaa 1
|
|
|
|
bbbbb 2
|
|
|
|
ccccc 3
|
|
|
|
name val
|
|
|
|
aaaaa 1
|
|
|
|
bbbbb 2
|
|
|
|
ccccc 3
|
|
|
|
call bug10136()|
|
|
|
|
name val
|
|
|
|
aaaaa 1
|
|
|
|
bbbbb 2
|
|
|
|
ccccc 3
|
|
|
|
name val
|
|
|
|
aaaaa 1
|
|
|
|
bbbbb 2
|
|
|
|
ccccc 3
|
|
|
|
name val
|
|
|
|
aaaaa 1
|
|
|
|
bbbbb 2
|
|
|
|
ccccc 3
|
|
|
|
drop procedure bug10136|
|
|
|
|
drop table t3|
|
2005-06-30 18:07:06 +02:00
|
|
|
drop procedure if exists bug11529|
|
|
|
|
create procedure bug11529()
|
|
|
|
begin
|
|
|
|
declare c cursor for select id, data from t1 where data in (10,13);
|
|
|
|
open c;
|
|
|
|
begin
|
|
|
|
declare vid char(16);
|
|
|
|
declare vdata int;
|
|
|
|
declare exit handler for not found begin end;
|
|
|
|
while true do
|
|
|
|
fetch c into vid, vdata;
|
|
|
|
end while;
|
|
|
|
end;
|
|
|
|
close c;
|
|
|
|
end|
|
|
|
|
insert into t1 values
|
|
|
|
('Name1', 10),
|
|
|
|
('Name2', 11),
|
|
|
|
('Name3', 12),
|
|
|
|
('Name4', 13),
|
|
|
|
('Name5', 14)|
|
|
|
|
call bug11529()|
|
|
|
|
call bug11529()|
|
|
|
|
delete from t1|
|
|
|
|
drop procedure bug11529|
|
2005-07-06 16:37:57 +02:00
|
|
|
drop procedure if exists bug6063|
|
|
|
|
drop procedure if exists bug7088_1|
|
|
|
|
drop procedure if exists bug7088_2|
|
2005-07-15 11:34:48 +02:00
|
|
|
drop procedure if exists bug9565_sub|
|
|
|
|
drop procedure if exists bug9565|
|
|
|
|
create procedure bug9565_sub()
|
|
|
|
begin
|
|
|
|
select * from t1;
|
|
|
|
end|
|
|
|
|
create procedure bug9565()
|
|
|
|
begin
|
|
|
|
insert into t1 values ("one", 1);
|
|
|
|
call bug9565_sub();
|
|
|
|
end|
|
|
|
|
call bug9565()|
|
|
|
|
id data
|
|
|
|
one 1
|
|
|
|
delete from t1|
|
|
|
|
drop procedure bug9565_sub|
|
|
|
|
drop procedure bug9565|
|
2005-07-15 17:24:19 +02:00
|
|
|
drop procedure if exists bug9538|
|
|
|
|
create procedure bug9538()
|
|
|
|
set @@sort_buffer_size = 1000000|
|
|
|
|
set @x = @@sort_buffer_size|
|
2005-07-15 19:46:44 +02:00
|
|
|
set @@sort_buffer_size = 2000000|
|
2005-07-15 17:24:19 +02:00
|
|
|
select @@sort_buffer_size|
|
|
|
|
@@sort_buffer_size
|
2005-07-15 19:46:44 +02:00
|
|
|
2000000
|
2005-07-15 17:24:19 +02:00
|
|
|
call bug9538()|
|
|
|
|
select @@sort_buffer_size|
|
|
|
|
@@sort_buffer_size
|
|
|
|
1000000
|
|
|
|
set @@sort_buffer_size = @x|
|
|
|
|
drop procedure bug9538|
|
2005-07-22 08:11:23 +02:00
|
|
|
drop procedure if exists bug8692|
|
|
|
|
create table t3 (c1 varchar(5), c2 char(5), c3 enum('one','two'), c4 text, c5 blob, c6 char(5), c7 varchar(5))|
|
|
|
|
insert into t3 values ('', '', '', '', '', '', NULL)|
|
|
|
|
Warnings:
|
|
|
|
Warning 1265 Data truncated for column 'c3' at row 1
|
|
|
|
create procedure bug8692()
|
|
|
|
begin
|
|
|
|
declare v1 VARCHAR(10);
|
|
|
|
declare v2 VARCHAR(10);
|
|
|
|
declare v3 VARCHAR(10);
|
|
|
|
declare v4 VARCHAR(10);
|
|
|
|
declare v5 VARCHAR(10);
|
|
|
|
declare v6 VARCHAR(10);
|
|
|
|
declare v7 VARCHAR(10);
|
|
|
|
declare c8692 cursor for select c1,c2,c3,c4,c5,c6,c7 from t3;
|
|
|
|
open c8692;
|
|
|
|
fetch c8692 into v1,v2,v3,v4,v5,v6,v7;
|
|
|
|
select v1, v2, v3, v4, v5, v6, v7;
|
|
|
|
end|
|
|
|
|
call bug8692()|
|
|
|
|
v1 v2 v3 v4 v5 v6 v7
|
|
|
|
NULL
|
|
|
|
drop procedure bug8692|
|
|
|
|
drop table t3|
|
2005-08-08 15:46:06 +02:00
|
|
|
drop function if exists bug10055|
|
|
|
|
create function bug10055(v char(255)) returns char(255) return lower(v)|
|
|
|
|
select t.column_name, bug10055(t.column_name)
|
|
|
|
from information_schema.columns as t
|
|
|
|
where t.table_schema = 'test' and t.table_name = 't1'|
|
|
|
|
column_name bug10055(t.column_name)
|
|
|
|
id id
|
|
|
|
data data
|
|
|
|
drop function bug10055|
|
2005-09-07 17:39:47 +02:00
|
|
|
drop procedure if exists bug12297|
|
|
|
|
create procedure bug12297(lim int)
|
|
|
|
begin
|
|
|
|
set @x = 0;
|
|
|
|
repeat
|
|
|
|
insert into t1(id,data)
|
|
|
|
values('aa', @x);
|
|
|
|
set @x = @x + 1;
|
|
|
|
until @x >= lim
|
|
|
|
end repeat;
|
|
|
|
end|
|
|
|
|
call bug12297(10)|
|
|
|
|
drop procedure bug12297|
|
2005-08-18 11:23:54 +02:00
|
|
|
drop function if exists f_bug11247|
|
|
|
|
drop procedure if exists p_bug11247|
|
|
|
|
create function f_bug11247(param int)
|
|
|
|
returns int
|
|
|
|
return param + 1|
|
|
|
|
create procedure p_bug11247(lim int)
|
|
|
|
begin
|
|
|
|
declare v int default 0;
|
|
|
|
while v < lim do
|
|
|
|
set v= f_bug11247(v);
|
|
|
|
end while;
|
|
|
|
end|
|
|
|
|
call p_bug11247(10)|
|
|
|
|
drop function f_bug11247|
|
|
|
|
drop procedure p_bug11247|
|
2005-08-19 15:03:21 +02:00
|
|
|
drop procedure if exists bug12168|
|
2005-08-24 10:25:57 +02:00
|
|
|
drop table if exists t3, t4|
|
|
|
|
create table t3 (a int)|
|
|
|
|
insert into t3 values (1),(2),(3),(4)|
|
|
|
|
create table t4 (a int)|
|
2005-08-19 15:03:21 +02:00
|
|
|
create procedure bug12168(arg1 char(1))
|
|
|
|
begin
|
|
|
|
declare b, c integer;
|
|
|
|
if arg1 = 'a' then
|
|
|
|
begin
|
2005-08-24 10:25:57 +02:00
|
|
|
declare c1 cursor for select a from t3 where a % 2;
|
2005-08-19 15:03:21 +02:00
|
|
|
declare continue handler for not found set b = 1;
|
|
|
|
set b = 0;
|
|
|
|
open c1;
|
|
|
|
c1_repeat: repeat
|
|
|
|
fetch c1 into c;
|
|
|
|
if (b = 1) then
|
|
|
|
leave c1_repeat;
|
|
|
|
end if;
|
2005-08-24 10:25:57 +02:00
|
|
|
insert into t4 values (c);
|
2005-08-19 15:03:21 +02:00
|
|
|
until b = 1
|
|
|
|
end repeat;
|
|
|
|
end;
|
|
|
|
end if;
|
|
|
|
if arg1 = 'b' then
|
|
|
|
begin
|
2005-08-24 10:25:57 +02:00
|
|
|
declare c2 cursor for select a from t3 where not a % 2;
|
2005-08-19 15:03:21 +02:00
|
|
|
declare continue handler for not found set b = 1;
|
|
|
|
set b = 0;
|
|
|
|
open c2;
|
|
|
|
c2_repeat: repeat
|
|
|
|
fetch c2 into c;
|
|
|
|
if (b = 1) then
|
|
|
|
leave c2_repeat;
|
|
|
|
end if;
|
2005-08-24 10:25:57 +02:00
|
|
|
insert into t4 values (c);
|
2005-08-19 15:03:21 +02:00
|
|
|
until b = 1
|
|
|
|
end repeat;
|
|
|
|
end;
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
call bug12168('a')|
|
2005-08-24 10:25:57 +02:00
|
|
|
select * from t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
a
|
|
|
|
1
|
|
|
|
3
|
2005-08-24 10:25:57 +02:00
|
|
|
truncate t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
call bug12168('b')|
|
2005-08-24 10:25:57 +02:00
|
|
|
select * from t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
a
|
|
|
|
2
|
|
|
|
4
|
2005-08-24 10:25:57 +02:00
|
|
|
truncate t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
call bug12168('a')|
|
2005-08-24 10:25:57 +02:00
|
|
|
select * from t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
a
|
|
|
|
1
|
|
|
|
3
|
2005-08-24 10:25:57 +02:00
|
|
|
truncate t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
call bug12168('b')|
|
2005-08-24 10:25:57 +02:00
|
|
|
select * from t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
a
|
|
|
|
2
|
|
|
|
4
|
2005-08-24 10:25:57 +02:00
|
|
|
truncate t4|
|
|
|
|
drop table t3, t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
drop procedure if exists bug12168|
|
2005-08-25 13:34:14 +02:00
|
|
|
drop table if exists t3|
|
|
|
|
drop procedure if exists bug11333|
|
|
|
|
create table t3 (c1 char(128))|
|
|
|
|
insert into t3 values
|
|
|
|
('AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA')|
|
|
|
|
create procedure bug11333(i int)
|
|
|
|
begin
|
|
|
|
declare tmp varchar(128);
|
|
|
|
set @x = 0;
|
|
|
|
repeat
|
|
|
|
select c1 into tmp from t3
|
|
|
|
where c1 = 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
|
|
|
|
set @x = @x + 1;
|
|
|
|
until @x >= i
|
|
|
|
end repeat;
|
|
|
|
end|
|
|
|
|
call bug11333(10)|
|
|
|
|
drop procedure bug11333|
|
|
|
|
drop table t3|
|
2005-08-27 08:26:14 +02:00
|
|
|
drop function if exists bug9048|
|
|
|
|
create function bug9048(f1 char binary) returns char binary
|
|
|
|
begin
|
|
|
|
set f1= concat( 'hello', f1 );
|
|
|
|
return f1;
|
|
|
|
end|
|
|
|
|
drop function bug9048|
|
2005-09-08 18:25:42 +02:00
|
|
|
drop procedure if exists bug12849_1|
|
|
|
|
create procedure bug12849_1(inout x char) select x into x|
|
|
|
|
set @var='a'|
|
|
|
|
call bug12849_1(@var)|
|
|
|
|
select @var|
|
|
|
|
@var
|
|
|
|
a
|
|
|
|
drop procedure bug12849_1|
|
|
|
|
drop procedure if exists bug12849_2|
|
|
|
|
create procedure bug12849_2(inout foo varchar(15))
|
|
|
|
begin
|
|
|
|
select concat(foo, foo) INTO foo;
|
|
|
|
end|
|
|
|
|
set @var='abcd'|
|
|
|
|
call bug12849_2(@var)|
|
|
|
|
select @var|
|
|
|
|
@var
|
|
|
|
abcdabcd
|
|
|
|
drop procedure bug12849_2|
|
2005-09-13 12:50:21 +02:00
|
|
|
drop procedure if exists bug131333|
|
|
|
|
drop function if exists bug131333|
|
|
|
|
create procedure bug131333()
|
|
|
|
begin
|
|
|
|
begin
|
|
|
|
declare a int;
|
|
|
|
select a;
|
|
|
|
set a = 1;
|
|
|
|
select a;
|
|
|
|
end;
|
|
|
|
begin
|
|
|
|
declare b int;
|
|
|
|
select b;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create function bug131333()
|
|
|
|
returns int
|
|
|
|
begin
|
|
|
|
begin
|
|
|
|
declare a int;
|
|
|
|
set a = 1;
|
|
|
|
end;
|
|
|
|
begin
|
|
|
|
declare b int;
|
|
|
|
return b;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
call bug131333()|
|
|
|
|
a
|
|
|
|
NULL
|
|
|
|
a
|
|
|
|
1
|
|
|
|
b
|
|
|
|
NULL
|
|
|
|
select bug131333()|
|
|
|
|
bug131333()
|
|
|
|
NULL
|
|
|
|
drop procedure bug131333|
|
|
|
|
drop function bug131333|
|
2005-09-13 15:32:42 +02:00
|
|
|
drop function if exists bug12379|
|
|
|
|
drop procedure if exists bug12379_1|
|
|
|
|
drop procedure if exists bug12379_2|
|
|
|
|
drop procedure if exists bug12379_3|
|
|
|
|
drop table if exists t3|
|
|
|
|
create table t3 (c1 char(1) primary key not null)|
|
|
|
|
create function bug12379()
|
|
|
|
returns integer
|
|
|
|
begin
|
|
|
|
insert into t3 values('X');
|
|
|
|
insert into t3 values('X');
|
|
|
|
return 0;
|
|
|
|
end|
|
|
|
|
create procedure bug12379_1()
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlexception select 42;
|
|
|
|
select bug12379();
|
|
|
|
END|
|
|
|
|
create procedure bug12379_2()
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlexception begin end;
|
|
|
|
select bug12379();
|
|
|
|
end|
|
|
|
|
create procedure bug12379_3()
|
|
|
|
begin
|
|
|
|
select bug12379();
|
|
|
|
end|
|
|
|
|
select bug12379()|
|
|
|
|
ERROR 23000: Duplicate entry 'X' for key 1
|
|
|
|
select 1|
|
|
|
|
1
|
|
|
|
1
|
|
|
|
call bug12379_1()|
|
|
|
|
bug12379()
|
|
|
|
42
|
|
|
|
42
|
|
|
|
select 2|
|
|
|
|
2
|
|
|
|
2
|
|
|
|
call bug12379_2()|
|
|
|
|
bug12379()
|
|
|
|
select 3|
|
|
|
|
3
|
|
|
|
3
|
|
|
|
call bug12379_3()|
|
|
|
|
ERROR 23000: Duplicate entry 'X' for key 1
|
|
|
|
select 4|
|
|
|
|
4
|
|
|
|
4
|
|
|
|
drop function bug12379|
|
|
|
|
drop procedure bug12379_1|
|
|
|
|
drop procedure bug12379_2|
|
|
|
|
drop procedure bug12379_3|
|
2005-09-14 10:54:02 +02:00
|
|
|
drop table t3|
|
2005-09-13 13:15:38 +02:00
|
|
|
drop procedure if exists bug13124|
|
|
|
|
create procedure bug13124()
|
|
|
|
begin
|
|
|
|
declare y integer;
|
|
|
|
set @x=y;
|
|
|
|
end|
|
|
|
|
call bug13124()|
|
|
|
|
drop procedure bug13124|
|
2005-09-14 05:25:32 +02:00
|
|
|
drop procedure if exists bug12979_1|
|
|
|
|
create procedure bug12979_1(inout d decimal(5)) set d = d / 2|
|
|
|
|
set @bug12979_user_var = NULL|
|
|
|
|
call bug12979_1(@bug12979_user_var)|
|
|
|
|
drop procedure bug12979_1|
|
|
|
|
drop procedure if exists bug12979_2|
|
|
|
|
create procedure bug12979_2()
|
|
|
|
begin
|
|
|
|
declare internal_var decimal(5);
|
|
|
|
set internal_var= internal_var / 2;
|
|
|
|
select internal_var;
|
|
|
|
end|
|
|
|
|
call bug12979_2()|
|
|
|
|
internal_var
|
|
|
|
NULL
|
|
|
|
drop procedure bug12979_2|
|
2005-09-26 18:22:00 +02:00
|
|
|
drop table if exists t3|
|
|
|
|
drop procedure if exists bug6127|
|
|
|
|
create table t3 (s1 int unique)|
|
|
|
|
set @sm=@@sql_mode|
|
|
|
|
set sql_mode='traditional'|
|
|
|
|
create procedure bug6127()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlstate '23000'
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlstate '22003'
|
|
|
|
insert into t3 values (0);
|
|
|
|
insert into t3 values (1000000000000000);
|
|
|
|
end;
|
|
|
|
insert into t3 values (1);
|
|
|
|
insert into t3 values (1);
|
|
|
|
end|
|
|
|
|
call bug6127()|
|
|
|
|
select * from t3|
|
|
|
|
s1
|
|
|
|
0
|
|
|
|
1
|
|
|
|
call bug6127()|
|
|
|
|
ERROR 23000: Duplicate entry '0' for key 1
|
|
|
|
select * from t3|
|
|
|
|
s1
|
|
|
|
0
|
|
|
|
1
|
|
|
|
set sql_mode=@sm|
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug6127|
|
2005-09-29 17:30:15 +02:00
|
|
|
drop procedure if exists bug12589_1|
|
|
|
|
drop procedure if exists bug12589_2|
|
|
|
|
drop procedure if exists bug12589_3|
|
|
|
|
create procedure bug12589_1()
|
|
|
|
begin
|
|
|
|
declare spv1 decimal(3,3);
|
|
|
|
set spv1= 123.456;
|
|
|
|
set spv1 = 'test';
|
|
|
|
create temporary table tm1 as select spv1;
|
|
|
|
show create table tm1;
|
|
|
|
drop temporary table tm1;
|
|
|
|
end|
|
|
|
|
create procedure bug12589_2()
|
|
|
|
begin
|
|
|
|
declare spv1 decimal(6,3);
|
|
|
|
set spv1= 123.456;
|
|
|
|
create temporary table tm1 as select spv1;
|
|
|
|
show create table tm1;
|
|
|
|
drop temporary table tm1;
|
|
|
|
end|
|
|
|
|
create procedure bug12589_3()
|
|
|
|
begin
|
|
|
|
declare spv1 decimal(6,3);
|
|
|
|
set spv1= -123.456;
|
|
|
|
create temporary table tm1 as select spv1;
|
|
|
|
show create table tm1;
|
|
|
|
drop temporary table tm1;
|
|
|
|
end|
|
|
|
|
call bug12589_1()|
|
|
|
|
Table Create Table
|
|
|
|
tm1 CREATE TEMPORARY TABLE `tm1` (
|
2005-12-07 15:01:17 +01:00
|
|
|
`spv1` decimal(3,3) default NULL
|
2005-09-29 17:30:15 +02:00
|
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
|
|
Warnings:
|
2005-12-07 15:01:17 +01:00
|
|
|
Warning 1264 Out of range value adjusted for column 'spv1' at row 1
|
|
|
|
Warning 1366 Incorrect decimal value: 'test' for column 'spv1' at row 1
|
2005-09-29 17:30:15 +02:00
|
|
|
call bug12589_2()|
|
|
|
|
Table Create Table
|
|
|
|
tm1 CREATE TEMPORARY TABLE `tm1` (
|
2005-12-07 15:01:17 +01:00
|
|
|
`spv1` decimal(6,3) default NULL
|
2005-09-29 17:30:15 +02:00
|
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
|
|
call bug12589_3()|
|
|
|
|
Table Create Table
|
|
|
|
tm1 CREATE TEMPORARY TABLE `tm1` (
|
|
|
|
`spv1` decimal(6,3) default NULL
|
|
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
2005-11-23 01:49:44 +01:00
|
|
|
drop procedure bug12589_1|
|
|
|
|
drop procedure bug12589_2|
|
|
|
|
drop procedure bug12589_3|
|
2005-09-26 18:46:31 +02:00
|
|
|
drop table if exists t3|
|
|
|
|
drop procedure if exists bug7049_1|
|
|
|
|
drop procedure if exists bug7049_2|
|
|
|
|
drop procedure if exists bug7049_3|
|
|
|
|
drop procedure if exists bug7049_4|
|
|
|
|
drop function if exists bug7049_1|
|
|
|
|
drop function if exists bug7049_2|
|
|
|
|
create table t3 ( x int unique )|
|
|
|
|
create procedure bug7049_1()
|
|
|
|
begin
|
|
|
|
insert into t3 values (42);
|
|
|
|
insert into t3 values (42);
|
|
|
|
end|
|
|
|
|
create procedure bug7049_2()
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlexception
|
|
|
|
select 'Caught it' as 'Result';
|
|
|
|
call bug7049_1();
|
|
|
|
select 'Missed it' as 'Result';
|
|
|
|
end|
|
|
|
|
create procedure bug7049_3()
|
|
|
|
call bug7049_1()|
|
|
|
|
create procedure bug7049_4()
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlexception
|
|
|
|
select 'Caught it' as 'Result';
|
|
|
|
call bug7049_3();
|
|
|
|
select 'Missed it' as 'Result';
|
|
|
|
end|
|
|
|
|
create function bug7049_1()
|
|
|
|
returns int
|
|
|
|
begin
|
|
|
|
insert into t3 values (42);
|
|
|
|
insert into t3 values (42);
|
|
|
|
return 42;
|
|
|
|
end|
|
|
|
|
create function bug7049_2()
|
|
|
|
returns int
|
|
|
|
begin
|
|
|
|
declare x int default 0;
|
|
|
|
declare continue handler for sqlexception
|
|
|
|
set x = 1;
|
|
|
|
set x = bug7049_1();
|
|
|
|
return x;
|
|
|
|
end|
|
|
|
|
call bug7049_2()|
|
|
|
|
Result
|
|
|
|
Caught it
|
|
|
|
select * from t3|
|
|
|
|
x
|
|
|
|
42
|
|
|
|
delete from t3|
|
|
|
|
call bug7049_4()|
|
|
|
|
Result
|
|
|
|
Caught it
|
|
|
|
select * from t3|
|
|
|
|
x
|
|
|
|
42
|
|
|
|
select bug7049_2()|
|
|
|
|
bug7049_2()
|
|
|
|
1
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug7049_1|
|
|
|
|
drop procedure bug7049_2|
|
|
|
|
drop procedure bug7049_3|
|
|
|
|
drop procedure bug7049_4|
|
|
|
|
drop function bug7049_1|
|
|
|
|
drop function bug7049_2|
|
2005-10-19 14:54:54 +02:00
|
|
|
drop function if exists bug13941|
|
|
|
|
drop procedure if exists bug13941|
|
|
|
|
create function bug13941(p_input_str text)
|
|
|
|
returns text
|
|
|
|
begin
|
|
|
|
declare p_output_str text;
|
|
|
|
set p_output_str = p_input_str;
|
|
|
|
set p_output_str = replace(p_output_str, 'xyzzy', 'plugh');
|
|
|
|
set p_output_str = replace(p_output_str, 'test', 'prova');
|
|
|
|
set p_output_str = replace(p_output_str, 'this', 'questo');
|
|
|
|
set p_output_str = replace(p_output_str, ' a ', 'una ');
|
|
|
|
set p_output_str = replace(p_output_str, 'is', '');
|
|
|
|
return p_output_str;
|
|
|
|
end|
|
|
|
|
create procedure bug13941(out sout varchar(128))
|
|
|
|
begin
|
|
|
|
set sout = 'Local';
|
|
|
|
set sout = ifnull(sout, 'DEF');
|
|
|
|
end|
|
|
|
|
select bug13941('this is a test')|
|
|
|
|
bug13941('this is a test')
|
|
|
|
questo una prova
|
|
|
|
call bug13941(@a)|
|
|
|
|
select @a|
|
|
|
|
@a
|
|
|
|
Local
|
|
|
|
drop function bug13941|
|
|
|
|
drop procedure bug13941|
|
2005-10-24 22:54:04 +02:00
|
|
|
DROP PROCEDURE IF EXISTS bug13095;
|
|
|
|
DROP TABLE IF EXISTS bug13095_t1;
|
|
|
|
DROP VIEW IF EXISTS bug13095_v1;
|
|
|
|
CREATE PROCEDURE bug13095(tbl_name varchar(32))
|
|
|
|
BEGIN
|
|
|
|
SET @str =
|
|
|
|
CONCAT("CREATE TABLE ", tbl_name, "(stuff char(15))");
|
|
|
|
SELECT @str;
|
|
|
|
PREPARE stmt FROM @str;
|
|
|
|
EXECUTE stmt;
|
|
|
|
SET @str =
|
|
|
|
CONCAT("INSERT INTO ", tbl_name, " VALUES('row1'),('row2'),('row3')" );
|
|
|
|
SELECT @str;
|
|
|
|
PREPARE stmt FROM @str;
|
|
|
|
EXECUTE stmt;
|
|
|
|
SET @str =
|
|
|
|
CONCAT("CREATE VIEW bug13095_v1(c1) AS SELECT stuff FROM ", tbl_name);
|
|
|
|
SELECT @str;
|
|
|
|
PREPARE stmt FROM @str;
|
|
|
|
EXECUTE stmt;
|
|
|
|
SELECT * FROM bug13095_v1;
|
|
|
|
SET @str =
|
|
|
|
"DROP VIEW bug13095_v1";
|
|
|
|
SELECT @str;
|
|
|
|
PREPARE stmt FROM @str;
|
|
|
|
EXECUTE stmt;
|
|
|
|
END|
|
|
|
|
CALL bug13095('bug13095_t1');
|
|
|
|
@str
|
|
|
|
CREATE TABLE bug13095_t1(stuff char(15))
|
|
|
|
@str
|
|
|
|
INSERT INTO bug13095_t1 VALUES('row1'),('row2'),('row3')
|
|
|
|
@str
|
|
|
|
CREATE VIEW bug13095_v1(c1) AS SELECT stuff FROM bug13095_t1
|
|
|
|
c1
|
|
|
|
row1
|
|
|
|
row2
|
|
|
|
row3
|
|
|
|
@str
|
|
|
|
DROP VIEW bug13095_v1
|
|
|
|
DROP PROCEDURE IF EXISTS bug13095;
|
|
|
|
DROP VIEW IF EXISTS bug13095_v1;
|
|
|
|
DROP TABLE IF EXISTS bug13095_t1;
|
2005-11-23 01:49:44 +01:00
|
|
|
drop function if exists bug14723|
|
|
|
|
drop procedure if exists bug14723|
|
|
|
|
/*!50003 create function bug14723()
|
|
|
|
returns bigint(20)
|
|
|
|
main_loop: begin
|
|
|
|
return 42;
|
|
|
|
end */;;
|
|
|
|
show create function bug14723;;
|
|
|
|
Function sql_mode Create Function
|
2006-03-02 13:18:49 +01:00
|
|
|
bug14723 CREATE DEFINER=`root`@`localhost` FUNCTION `bug14723`() RETURNS bigint(20)
|
2005-11-23 01:49:44 +01:00
|
|
|
main_loop: begin
|
|
|
|
return 42;
|
|
|
|
end
|
|
|
|
select bug14723();;
|
|
|
|
bug14723()
|
|
|
|
42
|
|
|
|
/*!50003 create procedure bug14723()
|
|
|
|
main_loop: begin
|
|
|
|
select 42;
|
|
|
|
end */;;
|
|
|
|
show create procedure bug14723;;
|
|
|
|
Procedure sql_mode Create Procedure
|
2006-03-02 13:18:49 +01:00
|
|
|
bug14723 CREATE DEFINER=`root`@`localhost` PROCEDURE `bug14723`()
|
2005-11-23 01:49:44 +01:00
|
|
|
main_loop: begin
|
|
|
|
select 42;
|
|
|
|
end
|
|
|
|
call bug14723();;
|
|
|
|
42
|
|
|
|
42
|
|
|
|
drop function bug14723|
|
|
|
|
drop procedure bug14723|
|
|
|
|
create procedure bug14845()
|
|
|
|
begin
|
|
|
|
declare a char(255);
|
|
|
|
declare done int default 0;
|
|
|
|
declare c cursor for select count(*) from t1 where 1 = 0;
|
|
|
|
declare continue handler for sqlstate '02000' set done = 1;
|
|
|
|
open c;
|
|
|
|
repeat
|
|
|
|
fetch c into a;
|
|
|
|
if not done then
|
|
|
|
select a;
|
|
|
|
end if;
|
|
|
|
until done end repeat;
|
|
|
|
close c;
|
|
|
|
end|
|
|
|
|
call bug14845()|
|
|
|
|
a
|
|
|
|
0
|
|
|
|
drop procedure bug14845|
|
|
|
|
drop procedure if exists bug13549_1|
|
|
|
|
drop procedure if exists bug13549_2|
|
|
|
|
CREATE PROCEDURE `bug13549_2`()
|
|
|
|
begin
|
|
|
|
call bug13549_1();
|
|
|
|
end|
|
|
|
|
CREATE PROCEDURE `bug13549_1`()
|
|
|
|
begin
|
|
|
|
declare done int default 0;
|
|
|
|
set done= not done;
|
|
|
|
end|
|
|
|
|
CALL bug13549_2()|
|
|
|
|
drop procedure bug13549_2|
|
|
|
|
drop procedure bug13549_1|
|
2005-11-23 00:11:19 +01:00
|
|
|
drop function if exists bug10100f|
|
|
|
|
drop procedure if exists bug10100p|
|
|
|
|
drop procedure if exists bug10100t|
|
|
|
|
drop procedure if exists bug10100pt|
|
|
|
|
drop procedure if exists bug10100pv|
|
|
|
|
drop procedure if exists bug10100pd|
|
|
|
|
drop procedure if exists bug10100pc|
|
|
|
|
create function bug10100f(prm int) returns int
|
|
|
|
begin
|
|
|
|
if prm > 1 then
|
|
|
|
return prm * bug10100f(prm - 1);
|
|
|
|
end if;
|
|
|
|
return 1;
|
|
|
|
end|
|
|
|
|
create procedure bug10100p(prm int, inout res int)
|
|
|
|
begin
|
|
|
|
set res = res * prm;
|
|
|
|
if prm > 1 then
|
|
|
|
call bug10100p(prm - 1, res);
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
create procedure bug10100t(prm int)
|
|
|
|
begin
|
|
|
|
declare res int;
|
|
|
|
set res = 1;
|
|
|
|
call bug10100p(prm, res);
|
|
|
|
select res;
|
|
|
|
end|
|
|
|
|
create table t3 (a int)|
|
|
|
|
insert into t3 values (0)|
|
|
|
|
create view v1 as select a from t3;
|
|
|
|
create procedure bug10100pt(level int, lim int)
|
|
|
|
begin
|
|
|
|
if level < lim then
|
|
|
|
update t3 set a=level;
|
|
|
|
FLUSH TABLES;
|
|
|
|
call bug10100pt(level+1, lim);
|
|
|
|
else
|
|
|
|
select * from t3;
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
create procedure bug10100pv(level int, lim int)
|
|
|
|
begin
|
|
|
|
if level < lim then
|
|
|
|
update v1 set a=level;
|
|
|
|
FLUSH TABLES;
|
|
|
|
call bug10100pv(level+1, lim);
|
|
|
|
else
|
|
|
|
select * from v1;
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
prepare stmt2 from "select * from t3;";
|
|
|
|
create procedure bug10100pd(level int, lim int)
|
|
|
|
begin
|
|
|
|
if level < lim then
|
|
|
|
select level;
|
|
|
|
prepare stmt1 from "update t3 set a=a+2";
|
|
|
|
execute stmt1;
|
|
|
|
FLUSH TABLES;
|
|
|
|
execute stmt1;
|
|
|
|
FLUSH TABLES;
|
|
|
|
execute stmt1;
|
|
|
|
FLUSH TABLES;
|
|
|
|
deallocate prepare stmt1;
|
|
|
|
execute stmt2;
|
|
|
|
select * from t3;
|
|
|
|
call bug10100pd(level+1, lim);
|
|
|
|
else
|
|
|
|
execute stmt2;
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
create procedure bug10100pc(level int, lim int)
|
|
|
|
begin
|
|
|
|
declare lv int;
|
|
|
|
declare c cursor for select a from t3;
|
|
|
|
open c;
|
|
|
|
if level < lim then
|
|
|
|
select level;
|
|
|
|
fetch c into lv;
|
|
|
|
select lv;
|
|
|
|
update t3 set a=level+lv;
|
|
|
|
FLUSH TABLES;
|
|
|
|
call bug10100pc(level+1, lim);
|
|
|
|
else
|
|
|
|
select * from t3;
|
|
|
|
end if;
|
|
|
|
close c;
|
|
|
|
end|
|
|
|
|
set @@max_sp_recursion_depth=4|
|
|
|
|
select @@max_sp_recursion_depth|
|
|
|
|
@@max_sp_recursion_depth
|
|
|
|
4
|
|
|
|
select bug10100f(3)|
|
|
|
|
ERROR HY000: Recursive stored functions and triggers are not allowed.
|
|
|
|
select bug10100f(6)|
|
|
|
|
ERROR HY000: Recursive stored functions and triggers are not allowed.
|
|
|
|
call bug10100t(5)|
|
|
|
|
res
|
|
|
|
120
|
|
|
|
call bug10100pt(1,5)|
|
|
|
|
a
|
|
|
|
4
|
|
|
|
call bug10100pv(1,5)|
|
|
|
|
a
|
|
|
|
4
|
|
|
|
update t3 set a=1|
|
|
|
|
call bug10100pd(1,5)|
|
|
|
|
level
|
|
|
|
1
|
|
|
|
a
|
|
|
|
7
|
|
|
|
a
|
|
|
|
7
|
|
|
|
level
|
|
|
|
2
|
|
|
|
a
|
|
|
|
13
|
|
|
|
a
|
|
|
|
13
|
|
|
|
level
|
|
|
|
3
|
|
|
|
a
|
|
|
|
19
|
|
|
|
a
|
|
|
|
19
|
|
|
|
level
|
|
|
|
4
|
|
|
|
a
|
|
|
|
25
|
|
|
|
a
|
|
|
|
25
|
|
|
|
a
|
|
|
|
25
|
|
|
|
select * from t3|
|
|
|
|
a
|
|
|
|
25
|
|
|
|
update t3 set a=1|
|
|
|
|
call bug10100pc(1,5)|
|
|
|
|
level
|
|
|
|
1
|
|
|
|
lv
|
|
|
|
1
|
|
|
|
level
|
|
|
|
2
|
|
|
|
lv
|
|
|
|
2
|
|
|
|
level
|
|
|
|
3
|
|
|
|
lv
|
|
|
|
4
|
|
|
|
level
|
|
|
|
4
|
|
|
|
lv
|
|
|
|
7
|
|
|
|
a
|
|
|
|
11
|
|
|
|
select * from t3|
|
|
|
|
a
|
|
|
|
11
|
|
|
|
set @@max_sp_recursion_depth=0|
|
|
|
|
select @@max_sp_recursion_depth|
|
|
|
|
@@max_sp_recursion_depth
|
|
|
|
0
|
|
|
|
select bug10100f(5)|
|
|
|
|
ERROR HY000: Recursive stored functions and triggers are not allowed.
|
|
|
|
call bug10100t(5)|
|
|
|
|
ERROR HY000: Recursive limit 0 (as set by the max_sp_recursion_depth variable) was exceeded for routine bug10100p
|
|
|
|
deallocate prepare stmt2|
|
|
|
|
drop function bug10100f|
|
|
|
|
drop procedure bug10100p|
|
|
|
|
drop procedure bug10100t|
|
|
|
|
drop procedure bug10100pt|
|
|
|
|
drop procedure bug10100pv|
|
|
|
|
drop procedure bug10100pd|
|
|
|
|
drop procedure bug10100pc|
|
|
|
|
drop view v1|
|
2005-11-23 11:56:53 +01:00
|
|
|
drop procedure if exists bug13729|
|
|
|
|
drop table if exists t3|
|
|
|
|
create table t3 (s1 int, primary key (s1))|
|
|
|
|
insert into t3 values (1),(2)|
|
|
|
|
create procedure bug13729()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception select 55;
|
|
|
|
update t3 set s1 = 1;
|
|
|
|
end|
|
|
|
|
call bug13729()|
|
|
|
|
55
|
|
|
|
55
|
|
|
|
select * from t3|
|
|
|
|
s1
|
|
|
|
1
|
|
|
|
2
|
|
|
|
drop procedure bug13729|
|
2005-11-23 00:11:19 +01:00
|
|
|
drop table t3|
|
2005-11-08 14:47:33 +01:00
|
|
|
drop procedure if exists bug14643_1|
|
|
|
|
drop procedure if exists bug14643_2|
|
|
|
|
create procedure bug14643_1()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception select 'boo' as 'Handler';
|
|
|
|
begin
|
2005-12-07 15:01:17 +01:00
|
|
|
declare v int default undefined_var;
|
2005-11-08 14:47:33 +01:00
|
|
|
if v = 1 then
|
|
|
|
select 1;
|
|
|
|
else
|
2005-12-07 15:01:17 +01:00
|
|
|
select v, isnull(v);
|
2005-11-08 14:47:33 +01:00
|
|
|
end if;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
create procedure bug14643_2()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception select 'boo' as 'Handler';
|
2005-12-07 15:01:17 +01:00
|
|
|
case undefined_var
|
2005-11-08 14:47:33 +01:00
|
|
|
when 1 then
|
|
|
|
select 1;
|
|
|
|
else
|
|
|
|
select 2;
|
|
|
|
end case;
|
2005-12-07 15:01:17 +01:00
|
|
|
select undefined_var;
|
2005-11-08 14:47:33 +01:00
|
|
|
end|
|
|
|
|
call bug14643_1()|
|
|
|
|
Handler
|
|
|
|
boo
|
2005-12-07 15:01:17 +01:00
|
|
|
v isnull(v)
|
|
|
|
NULL 1
|
2005-11-08 14:47:33 +01:00
|
|
|
call bug14643_2()|
|
|
|
|
Handler
|
|
|
|
boo
|
2005-12-07 15:01:17 +01:00
|
|
|
Handler
|
|
|
|
boo
|
2005-11-08 14:47:33 +01:00
|
|
|
drop procedure bug14643_1|
|
|
|
|
drop procedure bug14643_2|
|
2005-12-01 11:26:46 +01:00
|
|
|
drop procedure if exists bug14304|
|
|
|
|
drop table if exists t3, t4|
|
|
|
|
create table t3(a int primary key auto_increment)|
|
|
|
|
create table t4(a int primary key auto_increment)|
|
|
|
|
create procedure bug14304()
|
|
|
|
begin
|
|
|
|
insert into t3 set a=null;
|
|
|
|
insert into t4 set a=null;
|
|
|
|
insert into t4 set a=null;
|
|
|
|
insert into t4 set a=null;
|
|
|
|
insert into t4 set a=null;
|
|
|
|
insert into t4 set a=null;
|
|
|
|
insert into t4 select null as a;
|
|
|
|
insert into t3 set a=null;
|
|
|
|
insert into t3 set a=null;
|
|
|
|
select * from t3;
|
|
|
|
end|
|
|
|
|
call bug14304()|
|
|
|
|
a
|
|
|
|
1
|
|
|
|
2
|
|
|
|
3
|
|
|
|
drop procedure bug14304|
|
|
|
|
drop table t3, t4|
|
2005-11-01 14:58:52 +01:00
|
|
|
drop procedure if exists bug14376|
|
|
|
|
create procedure bug14376()
|
|
|
|
begin
|
|
|
|
declare x int default x;
|
|
|
|
end|
|
|
|
|
call bug14376()|
|
|
|
|
ERROR 42S22: Unknown column 'x' in 'field list'
|
|
|
|
drop procedure bug14376|
|
|
|
|
create procedure bug14376()
|
|
|
|
begin
|
|
|
|
declare x int default 42;
|
|
|
|
begin
|
|
|
|
declare x int default x;
|
|
|
|
select x;
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
call bug14376()|
|
|
|
|
x
|
|
|
|
42
|
|
|
|
drop procedure bug14376|
|
|
|
|
create procedure bug14376(x int)
|
|
|
|
begin
|
|
|
|
declare x int default x;
|
|
|
|
select x;
|
|
|
|
end|
|
|
|
|
call bug14376(4711)|
|
|
|
|
x
|
|
|
|
4711
|
|
|
|
drop procedure bug14376|
|
2005-12-08 22:58:59 +01:00
|
|
|
drop procedure if exists bug5967|
|
|
|
|
drop table if exists t3|
|
|
|
|
create table t3 (a varchar(255))|
|
|
|
|
insert into t3 (a) values ("a - table column")|
|
|
|
|
create procedure bug5967(a varchar(255))
|
2005-12-02 20:43:56 +01:00
|
|
|
begin
|
|
|
|
declare i varchar(255);
|
2005-12-08 22:58:59 +01:00
|
|
|
declare c cursor for select a from t3;
|
2005-12-02 20:43:56 +01:00
|
|
|
select a;
|
2005-12-08 22:58:59 +01:00
|
|
|
select a from t3 into i;
|
2005-12-02 20:43:56 +01:00
|
|
|
select i as 'Parameter takes precedence over table column'; open c;
|
|
|
|
fetch c into i;
|
|
|
|
close c;
|
|
|
|
select i as 'Parameter takes precedence over table column in cursors';
|
|
|
|
begin
|
|
|
|
declare a varchar(255) default 'a - local variable';
|
2005-12-08 22:58:59 +01:00
|
|
|
declare c1 cursor for select a from t3;
|
2005-12-02 20:43:56 +01:00
|
|
|
select a as 'A local variable takes precedence over parameter';
|
|
|
|
open c1;
|
|
|
|
fetch c1 into i;
|
|
|
|
close c1;
|
|
|
|
select i as 'A local variable takes precedence over parameter in cursors';
|
|
|
|
begin
|
|
|
|
declare a varchar(255) default 'a - local variable in a nested compound statement';
|
2005-12-08 22:58:59 +01:00
|
|
|
declare c2 cursor for select a from t3;
|
2005-12-02 20:43:56 +01:00
|
|
|
select a as 'A local variable in a nested compound statement takes precedence over a local variable in the outer statement';
|
2005-12-08 22:58:59 +01:00
|
|
|
select a from t3 into i;
|
2005-12-02 20:43:56 +01:00
|
|
|
select i as 'A local variable in a nested compound statement takes precedence over table column';
|
|
|
|
open c2;
|
|
|
|
fetch c2 into i;
|
|
|
|
close c2;
|
|
|
|
select i as 'A local variable in a nested compound statement takes precedence over table column in cursors';
|
|
|
|
end;
|
|
|
|
end;
|
|
|
|
end|
|
2005-12-08 22:58:59 +01:00
|
|
|
call bug5967("a - stored procedure parameter")|
|
2005-12-02 20:43:56 +01:00
|
|
|
a
|
|
|
|
a - stored procedure parameter
|
|
|
|
Parameter takes precedence over table column
|
|
|
|
a - stored procedure parameter
|
|
|
|
Parameter takes precedence over table column in cursors
|
|
|
|
a - stored procedure parameter
|
|
|
|
A local variable takes precedence over parameter
|
|
|
|
a - local variable
|
|
|
|
A local variable takes precedence over parameter in cursors
|
|
|
|
a - local variable
|
|
|
|
A local variable in a nested compound statement takes precedence over a local variable in the outer statement
|
|
|
|
a - local variable in a nested compound statement
|
|
|
|
A local variable in a nested compound statement takes precedence over table column
|
|
|
|
a - local variable in a nested compound statement
|
|
|
|
A local variable in a nested compound statement takes precedence over table column in cursors
|
|
|
|
a - local variable in a nested compound statement
|
2005-12-08 22:58:59 +01:00
|
|
|
drop procedure bug5967|
|
2005-12-02 22:59:45 +01:00
|
|
|
drop procedure if exists bug13012|
|
|
|
|
create procedure bug13012()
|
|
|
|
BEGIN
|
|
|
|
REPAIR TABLE t1;
|
|
|
|
BACKUP TABLE t1 to '../tmp';
|
|
|
|
DROP TABLE t1;
|
|
|
|
RESTORE TABLE t1 FROM '../tmp';
|
|
|
|
END|
|
|
|
|
call bug13012()|
|
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 repair status OK
|
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 backup status OK
|
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 restore status OK
|
|
|
|
drop procedure bug13012|
|
2005-12-03 15:02:09 +01:00
|
|
|
create view v1 as select * from t1|
|
|
|
|
create procedure bug13012()
|
|
|
|
BEGIN
|
|
|
|
REPAIR TABLE t1,t2,t3,v1;
|
|
|
|
OPTIMIZE TABLE t1,t2,t3,v1;
|
|
|
|
ANALYZE TABLE t1,t2,t3,v1;
|
|
|
|
END|
|
|
|
|
call bug13012()|
|
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 repair status OK
|
|
|
|
test.t2 repair status OK
|
2005-12-08 22:58:59 +01:00
|
|
|
test.t3 repair status OK
|
2005-12-05 12:08:30 +01:00
|
|
|
test.v1 repair error 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 optimize status OK
|
|
|
|
test.t2 optimize status OK
|
2005-12-08 22:58:59 +01:00
|
|
|
test.t3 optimize status OK
|
2005-12-05 12:08:30 +01:00
|
|
|
test.v1 optimize error 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 analyze status Table is already up to date
|
|
|
|
test.t2 analyze status Table is already up to date
|
2005-12-08 22:58:59 +01:00
|
|
|
test.t3 analyze status Table is already up to date
|
2005-12-05 12:08:30 +01:00
|
|
|
test.v1 analyze error 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
Warnings:
|
2005-12-05 12:08:30 +01:00
|
|
|
Error 1347 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
call bug13012()|
|
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 repair status OK
|
|
|
|
test.t2 repair status OK
|
2005-12-08 22:58:59 +01:00
|
|
|
test.t3 repair status OK
|
2005-12-05 12:08:30 +01:00
|
|
|
test.v1 repair error 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 optimize status OK
|
|
|
|
test.t2 optimize status OK
|
2005-12-08 22:58:59 +01:00
|
|
|
test.t3 optimize status OK
|
2005-12-05 12:08:30 +01:00
|
|
|
test.v1 optimize error 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 analyze status Table is already up to date
|
|
|
|
test.t2 analyze status Table is already up to date
|
2005-12-08 22:58:59 +01:00
|
|
|
test.t3 analyze status Table is already up to date
|
2005-12-05 12:08:30 +01:00
|
|
|
test.v1 analyze error 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
Warnings:
|
2005-12-05 12:08:30 +01:00
|
|
|
Error 1347 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
call bug13012()|
|
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 repair status OK
|
|
|
|
test.t2 repair status OK
|
2005-12-08 22:58:59 +01:00
|
|
|
test.t3 repair status OK
|
2005-12-05 12:08:30 +01:00
|
|
|
test.v1 repair error 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 optimize status OK
|
|
|
|
test.t2 optimize status OK
|
2005-12-08 22:58:59 +01:00
|
|
|
test.t3 optimize status OK
|
2005-12-05 12:08:30 +01:00
|
|
|
test.v1 optimize error 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
Table Op Msg_type Msg_text
|
|
|
|
test.t1 analyze status Table is already up to date
|
|
|
|
test.t2 analyze status Table is already up to date
|
2005-12-08 22:58:59 +01:00
|
|
|
test.t3 analyze status Table is already up to date
|
2005-12-05 12:08:30 +01:00
|
|
|
test.v1 analyze error 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
Warnings:
|
2005-12-05 12:08:30 +01:00
|
|
|
Error 1347 'test.v1' is not BASE TABLE
|
2005-12-03 15:02:09 +01:00
|
|
|
drop procedure bug13012|
|
|
|
|
drop view v1;
|
2005-12-02 22:59:45 +01:00
|
|
|
select * from t1|
|
2005-12-08 22:58:59 +01:00
|
|
|
id data
|
|
|
|
aa 0
|
|
|
|
aa 1
|
|
|
|
aa 2
|
|
|
|
aa 3
|
|
|
|
aa 4
|
|
|
|
aa 5
|
|
|
|
aa 6
|
|
|
|
aa 7
|
|
|
|
aa 8
|
|
|
|
aa 9
|
2005-12-06 22:57:15 +01:00
|
|
|
drop schema if exists mysqltest1|
|
|
|
|
Warnings:
|
|
|
|
Note 1008 Can't drop database 'mysqltest1'; database doesn't exist
|
|
|
|
drop schema if exists mysqltest2|
|
|
|
|
Warnings:
|
|
|
|
Note 1008 Can't drop database 'mysqltest2'; database doesn't exist
|
|
|
|
drop schema if exists mysqltest3|
|
|
|
|
Warnings:
|
|
|
|
Note 1008 Can't drop database 'mysqltest3'; database doesn't exist
|
|
|
|
create schema mysqltest1|
|
|
|
|
create schema mysqltest2|
|
|
|
|
create schema mysqltest3|
|
|
|
|
use mysqltest3|
|
|
|
|
create procedure mysqltest1.p1 (out prequestid varchar(100))
|
|
|
|
begin
|
|
|
|
call mysqltest2.p2('call mysqltest3.p3(1, 2)');
|
|
|
|
end|
|
|
|
|
create procedure mysqltest2.p2(in psql text)
|
|
|
|
begin
|
|
|
|
declare lsql text;
|
|
|
|
set @lsql= psql;
|
|
|
|
prepare lstatement from @lsql;
|
|
|
|
execute lstatement;
|
|
|
|
deallocate prepare lstatement;
|
|
|
|
end|
|
|
|
|
create procedure mysqltest3.p3(in p1 int)
|
|
|
|
begin
|
|
|
|
select p1;
|
|
|
|
end|
|
|
|
|
call mysqltest1.p1(@rs)|
|
|
|
|
ERROR 42000: Incorrect number of arguments for PROCEDURE mysqltest3.p3; expected 1, got 2
|
|
|
|
call mysqltest1.p1(@rs)|
|
|
|
|
ERROR 42000: Incorrect number of arguments for PROCEDURE mysqltest3.p3; expected 1, got 2
|
|
|
|
call mysqltest1.p1(@rs)|
|
|
|
|
ERROR 42000: Incorrect number of arguments for PROCEDURE mysqltest3.p3; expected 1, got 2
|
|
|
|
drop schema if exists mysqltest1|
|
|
|
|
drop schema if exists mysqltest2|
|
|
|
|
drop schema if exists mysqltest3|
|
|
|
|
use test|
|
2005-12-08 22:58:59 +01:00
|
|
|
drop table if exists t3|
|
|
|
|
drop procedure if exists bug15441|
|
|
|
|
create table t3 (id int not null primary key, county varchar(25))|
|
|
|
|
insert into t3 (id, county) values (1, 'York')|
|
|
|
|
create procedure bug15441(c varchar(25))
|
|
|
|
begin
|
|
|
|
update t3 set id=2, county=values(c);
|
|
|
|
end|
|
|
|
|
call bug15441('county')|
|
|
|
|
ERROR 42S22: Unknown column 'c' in 'field list'
|
|
|
|
drop procedure bug15441|
|
|
|
|
create procedure bug15441(county varchar(25))
|
|
|
|
begin
|
|
|
|
declare c varchar(25) default "hello";
|
|
|
|
insert into t3 (id, county) values (1, county)
|
|
|
|
on duplicate key update county= values(county);
|
|
|
|
select * from t3;
|
|
|
|
update t3 set id=2, county=values(id);
|
|
|
|
select * from t3;
|
|
|
|
end|
|
|
|
|
call bug15441('Yale')|
|
|
|
|
id county
|
|
|
|
1 Yale
|
|
|
|
id county
|
|
|
|
2 NULL
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug15441|
|
Fixed BUG#14498: Stored procedures: hang if undefined variable and exception
The problem was to continue at the right place in the code after the
test expression in a flow control statement fails with an exception
(internally, the test in sp_instr_jump_if_not), and the exception is
caught by a continue handler. Execution must then be resumed after the
the entire flow control statement (END IF, END WHILE, etc).
mysql-test/r/sp.result:
New test case for BUG#14498.
mysql-test/t/sp.test:
New test case for BUG#14498.
(Note that one call is disabled at the moment. Depends on BUG#14643.)
sql/sp_head.cc:
Added a continuation destination for sp_instr_jump_if_not, for the case when
an error in the test expression causes a continue handler to catch.
This includes new members in sp_instr_jump_if_not, adjustment of the optmizer
(mark and move methods), and separate backpatching code (since we can't use
the normal one for this).
Also removed the class sp_instr_jump, since it's never used.
...and added some comments to the optimizer.
sql/sp_head.h:
Added a continuation destination for sp_instr_jump_if_not, for the case when
an error in the test expression causes a continue handler to catch.
This includes new members in sp_instr_jump_if_not, adjustment of the optmizer
(mark and move methods), and separate backpatching code (since we can't use
the normal one for this).
Also removed the class sp_instr_jump, since it's never used.
sql/sql_yacc.yy:
Added backpatching of the continue destination for all conditional statements
(using sp_instr_jump_if_not).
2005-11-04 15:37:39 +01:00
|
|
|
drop procedure if exists bug14498_1|
|
|
|
|
drop procedure if exists bug14498_2|
|
|
|
|
drop procedure if exists bug14498_3|
|
|
|
|
drop procedure if exists bug14498_4|
|
|
|
|
drop procedure if exists bug14498_5|
|
|
|
|
create procedure bug14498_1()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception select 'error' as 'Handler';
|
|
|
|
if v then
|
|
|
|
select 'yes' as 'v';
|
|
|
|
else
|
|
|
|
select 'no' as 'v';
|
|
|
|
end if;
|
|
|
|
select 'done' as 'End';
|
|
|
|
end|
|
|
|
|
create procedure bug14498_2()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception select 'error' as 'Handler';
|
|
|
|
while v do
|
|
|
|
select 'yes' as 'v';
|
|
|
|
end while;
|
|
|
|
select 'done' as 'End';
|
|
|
|
end|
|
|
|
|
create procedure bug14498_3()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception select 'error' as 'Handler';
|
|
|
|
repeat
|
|
|
|
select 'maybe' as 'v';
|
|
|
|
until v end repeat;
|
|
|
|
select 'done' as 'End';
|
|
|
|
end|
|
|
|
|
create procedure bug14498_4()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception select 'error' as 'Handler';
|
|
|
|
case v
|
|
|
|
when 1 then
|
|
|
|
select '1' as 'v';
|
|
|
|
when 2 then
|
|
|
|
select '2' as 'v';
|
|
|
|
else
|
|
|
|
select '?' as 'v';
|
|
|
|
end case;
|
|
|
|
select 'done' as 'End';
|
|
|
|
end|
|
|
|
|
create procedure bug14498_5()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception select 'error' as 'Handler';
|
|
|
|
case
|
|
|
|
when v = 1 then
|
|
|
|
select '1' as 'v';
|
|
|
|
when v = 2 then
|
|
|
|
select '2' as 'v';
|
|
|
|
else
|
|
|
|
select '?' as 'v';
|
|
|
|
end case;
|
|
|
|
select 'done' as 'End';
|
|
|
|
end|
|
|
|
|
call bug14498_1()|
|
|
|
|
Handler
|
|
|
|
error
|
|
|
|
End
|
|
|
|
done
|
|
|
|
call bug14498_2()|
|
|
|
|
Handler
|
|
|
|
error
|
|
|
|
End
|
|
|
|
done
|
|
|
|
call bug14498_3()|
|
|
|
|
v
|
|
|
|
maybe
|
|
|
|
Handler
|
|
|
|
error
|
|
|
|
End
|
|
|
|
done
|
2006-01-26 17:26:25 +01:00
|
|
|
call bug14498_4()|
|
|
|
|
Handler
|
|
|
|
error
|
|
|
|
End
|
|
|
|
done
|
Fixed BUG#14498: Stored procedures: hang if undefined variable and exception
The problem was to continue at the right place in the code after the
test expression in a flow control statement fails with an exception
(internally, the test in sp_instr_jump_if_not), and the exception is
caught by a continue handler. Execution must then be resumed after the
the entire flow control statement (END IF, END WHILE, etc).
mysql-test/r/sp.result:
New test case for BUG#14498.
mysql-test/t/sp.test:
New test case for BUG#14498.
(Note that one call is disabled at the moment. Depends on BUG#14643.)
sql/sp_head.cc:
Added a continuation destination for sp_instr_jump_if_not, for the case when
an error in the test expression causes a continue handler to catch.
This includes new members in sp_instr_jump_if_not, adjustment of the optmizer
(mark and move methods), and separate backpatching code (since we can't use
the normal one for this).
Also removed the class sp_instr_jump, since it's never used.
...and added some comments to the optimizer.
sql/sp_head.h:
Added a continuation destination for sp_instr_jump_if_not, for the case when
an error in the test expression causes a continue handler to catch.
This includes new members in sp_instr_jump_if_not, adjustment of the optmizer
(mark and move methods), and separate backpatching code (since we can't use
the normal one for this).
Also removed the class sp_instr_jump, since it's never used.
sql/sql_yacc.yy:
Added backpatching of the continue destination for all conditional statements
(using sp_instr_jump_if_not).
2005-11-04 15:37:39 +01:00
|
|
|
call bug14498_5()|
|
|
|
|
Handler
|
|
|
|
error
|
|
|
|
End
|
|
|
|
done
|
|
|
|
drop procedure bug14498_1|
|
|
|
|
drop procedure bug14498_2|
|
|
|
|
drop procedure bug14498_3|
|
|
|
|
drop procedure bug14498_4|
|
|
|
|
drop procedure bug14498_5|
|
2005-12-13 13:12:42 +01:00
|
|
|
drop table if exists t3|
|
|
|
|
drop procedure if exists bug15231_1|
|
|
|
|
drop procedure if exists bug15231_2|
|
|
|
|
drop procedure if exists bug15231_3|
|
|
|
|
drop procedure if exists bug15231_4|
|
|
|
|
create table t3 (id int not null)|
|
|
|
|
create procedure bug15231_1()
|
|
|
|
begin
|
|
|
|
declare xid integer;
|
|
|
|
declare xdone integer default 0;
|
|
|
|
declare continue handler for not found set xdone = 1;
|
|
|
|
set xid=null;
|
|
|
|
call bug15231_2(xid);
|
|
|
|
select xid, xdone;
|
|
|
|
end|
|
|
|
|
create procedure bug15231_2(inout ioid integer)
|
|
|
|
begin
|
|
|
|
select "Before NOT FOUND condition is triggered" as '1';
|
|
|
|
select id into ioid from t3 where id=ioid;
|
|
|
|
select "After NOT FOUND condtition is triggered" as '2';
|
|
|
|
if ioid is null then
|
|
|
|
set ioid=1;
|
|
|
|
end if;
|
|
|
|
end|
|
|
|
|
create procedure bug15231_3()
|
|
|
|
begin
|
|
|
|
declare exit handler for sqlwarning
|
|
|
|
select 'Caught it (wrong)' as 'Result';
|
|
|
|
call bug15231_4();
|
|
|
|
end|
|
|
|
|
create procedure bug15231_4()
|
|
|
|
begin
|
|
|
|
declare x decimal(2,1);
|
|
|
|
set x = 'zap';
|
|
|
|
select 'Missed it (correct)' as 'Result';
|
|
|
|
end|
|
|
|
|
call bug15231_1()|
|
|
|
|
1
|
|
|
|
Before NOT FOUND condition is triggered
|
|
|
|
2
|
|
|
|
After NOT FOUND condtition is triggered
|
|
|
|
xid xdone
|
|
|
|
1 0
|
|
|
|
Warnings:
|
2006-01-17 19:10:47 +01:00
|
|
|
Warning 1329 No data - zero rows fetched, selected, or processed
|
2005-12-13 13:12:42 +01:00
|
|
|
call bug15231_3()|
|
|
|
|
Result
|
|
|
|
Missed it (correct)
|
|
|
|
Warnings:
|
|
|
|
Warning 1366 Incorrect decimal value: 'zap' for column 'x' at row 1
|
|
|
|
drop table if exists t3|
|
|
|
|
drop procedure if exists bug15231_1|
|
|
|
|
drop procedure if exists bug15231_2|
|
|
|
|
drop procedure if exists bug15231_3|
|
|
|
|
drop procedure if exists bug15231_4|
|
2006-01-25 17:19:54 +01:00
|
|
|
drop procedure if exists bug15011|
|
|
|
|
create table t3 (c1 int primary key)|
|
|
|
|
insert into t3 values (1)|
|
|
|
|
create procedure bug15011()
|
|
|
|
deterministic
|
|
|
|
begin
|
|
|
|
declare continue handler for 1062
|
|
|
|
select 'Outer' as 'Handler';
|
|
|
|
begin
|
|
|
|
declare continue handler for 1062
|
|
|
|
select 'Inner' as 'Handler';
|
|
|
|
insert into t3 values (1);
|
|
|
|
end;
|
|
|
|
end|
|
|
|
|
call bug15011()|
|
|
|
|
Handler
|
|
|
|
Inner
|
|
|
|
drop procedure bug15011|
|
|
|
|
drop table t3|
|
2006-03-02 12:05:55 +01:00
|
|
|
drop function if exists bug17615|
|
|
|
|
create table t3 (a varchar(256) unicode)|
|
|
|
|
create function bug17615() returns varchar(256) unicode
|
|
|
|
begin
|
|
|
|
declare tmp_res varchar(256) unicode;
|
|
|
|
set tmp_res= 'foo string';
|
|
|
|
return tmp_res;
|
|
|
|
end|
|
|
|
|
insert into t3 values(bug17615())|
|
|
|
|
select * from t3|
|
|
|
|
a
|
|
|
|
foo string
|
|
|
|
drop function bug17615|
|
|
|
|
drop table t3|
|
2006-03-02 14:54:04 +01:00
|
|
|
drop procedure if exists bug17476|
|
|
|
|
create table t3 ( d date )|
|
|
|
|
insert into t3 values
|
|
|
|
( '2005-01-01' ), ( '2005-01-02' ), ( '2005-01-03' ),
|
|
|
|
( '2005-01-04' ), ( '2005-02-01' ), ( '2005-02-02' )|
|
|
|
|
create procedure bug17476(pDateFormat varchar(10))
|
|
|
|
select date_format(t3.d, pDateFormat), count(*)
|
|
|
|
from t3
|
|
|
|
group by date_format(t3.d, pDateFormat)|
|
|
|
|
call bug17476('%Y-%m')|
|
|
|
|
date_format(t3.d, pDateFormat) count(*)
|
|
|
|
2005-01 4
|
|
|
|
2005-02 2
|
|
|
|
call bug17476('%Y-%m')|
|
|
|
|
date_format(t3.d, pDateFormat) count(*)
|
|
|
|
2005-01 4
|
|
|
|
2005-02 2
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug17476|
|
2006-02-15 12:11:29 +01:00
|
|
|
drop table if exists t3|
|
|
|
|
drop procedure if exists bug16887|
|
|
|
|
create table t3 ( c varchar(1) )|
|
|
|
|
insert into t3 values
|
|
|
|
(' '),('.'),(';'),(','),('-'),('_'),('('),(')'),('/'),('\\')|
|
|
|
|
create procedure bug16887()
|
|
|
|
begin
|
|
|
|
declare i int default 10;
|
|
|
|
again:
|
|
|
|
while i > 0 do
|
|
|
|
begin
|
|
|
|
declare breakchar varchar(1);
|
|
|
|
declare done int default 0;
|
|
|
|
declare t3_cursor cursor for select c from t3;
|
|
|
|
declare continue handler for not found set done = 1;
|
|
|
|
set i = i - 1;
|
|
|
|
select i;
|
|
|
|
if i = 3 then
|
|
|
|
iterate again;
|
|
|
|
end if;
|
|
|
|
open t3_cursor;
|
|
|
|
loop
|
|
|
|
fetch t3_cursor into breakchar;
|
|
|
|
if done = 1 then
|
|
|
|
begin
|
|
|
|
close t3_cursor;
|
|
|
|
iterate again;
|
|
|
|
end;
|
|
|
|
end if;
|
|
|
|
end loop;
|
|
|
|
end;
|
|
|
|
end while;
|
|
|
|
end|
|
|
|
|
call bug16887()|
|
|
|
|
i
|
|
|
|
9
|
|
|
|
i
|
|
|
|
8
|
|
|
|
i
|
|
|
|
7
|
|
|
|
i
|
|
|
|
6
|
|
|
|
i
|
|
|
|
5
|
|
|
|
i
|
|
|
|
4
|
|
|
|
i
|
|
|
|
3
|
|
|
|
i
|
|
|
|
2
|
|
|
|
i
|
|
|
|
1
|
|
|
|
i
|
|
|
|
0
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug16887|
|
2006-03-10 11:53:00 +01:00
|
|
|
create table t3 (f1 int, f2 varchar(3), primary key(f1)) engine=innodb|
|
|
|
|
insert into t3 values (1,'aaa'),(2,'bbb'),(3,'ccc')|
|
|
|
|
CREATE FUNCTION bug13575 ( p1 integer )
|
|
|
|
returns varchar(3)
|
|
|
|
BEGIN
|
|
|
|
DECLARE v1 VARCHAR(10) DEFAULT null;
|
|
|
|
SELECT f2 INTO v1 FROM t3 WHERE f1 = p1;
|
|
|
|
RETURN v1;
|
|
|
|
END|
|
|
|
|
select distinct f1, bug13575(f1) from t3 order by f1|
|
|
|
|
f1 bug13575(f1)
|
|
|
|
1 aaa
|
|
|
|
2 bbb
|
|
|
|
3 ccc
|
|
|
|
drop function bug13575;
|
|
|
|
drop table t3|
|
2006-03-10 14:04:56 +01:00
|
|
|
drop procedure if exists bug16474_1|
|
|
|
|
drop procedure if exists bug16474_2|
|
|
|
|
delete from t1|
|
|
|
|
insert into t1 values ('c', 2), ('b', 3), ('a', 1)|
|
|
|
|
create procedure bug16474_1()
|
|
|
|
begin
|
|
|
|
declare x int;
|
|
|
|
select id from t1 order by x;
|
|
|
|
end|
|
2006-04-06 12:19:01 +02:00
|
|
|
drop procedure if exists bug14945|
|
|
|
|
create table t3 (id int not null auto_increment primary key)|
|
|
|
|
create procedure bug14945() deterministic truncate t3|
|
|
|
|
insert into t3 values (null)|
|
|
|
|
call bug14945()|
|
|
|
|
insert into t3 values (null)|
|
|
|
|
select * from t3|
|
|
|
|
id
|
|
|
|
1
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug14945|
|
2006-03-10 14:04:56 +01:00
|
|
|
create procedure bug16474_2(x int)
|
|
|
|
select id from t1 order by x|
|
|
|
|
call bug16474_1()|
|
|
|
|
id
|
|
|
|
c
|
|
|
|
b
|
|
|
|
a
|
|
|
|
call bug16474_2(1)|
|
|
|
|
id
|
|
|
|
c
|
|
|
|
b
|
|
|
|
a
|
|
|
|
call bug16474_2(2)|
|
|
|
|
id
|
|
|
|
c
|
|
|
|
b
|
|
|
|
a
|
|
|
|
drop procedure bug16474_1|
|
|
|
|
drop procedure bug16474_2|
|
2006-03-28 14:16:21 +02:00
|
|
|
set @x = 2|
|
|
|
|
select * from t1 order by @x|
|
|
|
|
id data
|
|
|
|
c 2
|
|
|
|
b 3
|
|
|
|
a 1
|
2006-03-10 14:04:56 +01:00
|
|
|
delete from t1|
|
2006-04-21 16:55:04 +02:00
|
|
|
drop function if exists bug15728|
|
|
|
|
drop table if exists t3|
|
|
|
|
create table t3 (
|
|
|
|
id int not null auto_increment,
|
|
|
|
primary key (id)
|
|
|
|
)|
|
|
|
|
create function bug15728() returns int(11)
|
|
|
|
return last_insert_id()|
|
|
|
|
insert into t3 values (0)|
|
|
|
|
select last_insert_id()|
|
|
|
|
last_insert_id()
|
|
|
|
1
|
|
|
|
select bug15728()|
|
|
|
|
bug15728()
|
|
|
|
1
|
|
|
|
drop function bug15728|
|
|
|
|
drop table t3|
|
2006-04-11 12:17:57 +02:00
|
|
|
drop procedure if exists bug18787|
|
|
|
|
create procedure bug18787()
|
|
|
|
begin
|
|
|
|
declare continue handler for sqlexception begin end;
|
|
|
|
select no_such_function();
|
|
|
|
end|
|
|
|
|
call bug18787()|
|
|
|
|
no_such_function()
|
|
|
|
NULL
|
|
|
|
drop procedure bug18787|
|
2006-04-18 16:01:01 +02:00
|
|
|
create database bug18344_012345678901|
|
|
|
|
use bug18344_012345678901|
|
|
|
|
create procedure bug18344() begin end|
|
|
|
|
create procedure bug18344_2() begin end|
|
|
|
|
create database bug18344_0123456789012|
|
|
|
|
use bug18344_0123456789012|
|
|
|
|
create procedure bug18344() begin end|
|
|
|
|
create procedure bug18344_2() begin end|
|
|
|
|
use test|
|
|
|
|
select schema_name from information_schema.schemata where
|
|
|
|
schema_name like 'bug18344%'|
|
|
|
|
schema_name
|
|
|
|
bug18344_012345678901
|
|
|
|
bug18344_0123456789012
|
|
|
|
select routine_name,routine_schema from information_schema.routines where
|
|
|
|
routine_schema like 'bug18344%'|
|
|
|
|
routine_name routine_schema
|
|
|
|
bug18344 bug18344_012345678901
|
|
|
|
bug18344_2 bug18344_012345678901
|
|
|
|
bug18344 bug18344_0123456789012
|
|
|
|
bug18344_2 bug18344_0123456789012
|
|
|
|
drop database bug18344_012345678901|
|
|
|
|
drop database bug18344_0123456789012|
|
|
|
|
select schema_name from information_schema.schemata where
|
|
|
|
schema_name like 'bug18344%'|
|
|
|
|
schema_name
|
|
|
|
select routine_name,routine_schema from information_schema.routines where
|
|
|
|
routine_schema like 'bug18344%'|
|
|
|
|
routine_name routine_schema
|
2006-05-09 14:39:11 +02:00
|
|
|
drop function if exists bug12472|
|
|
|
|
create function bug12472() returns int return (select count(*) from t1)|
|
|
|
|
create table t3 as select bug12472() as i|
|
|
|
|
show create table t3|
|
|
|
|
Table Create Table
|
|
|
|
t3 CREATE TABLE `t3` (
|
|
|
|
`i` int(11) default NULL
|
|
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
|
|
select * from t3|
|
|
|
|
i
|
|
|
|
0
|
|
|
|
drop table t3|
|
|
|
|
create view v1 as select bug12472() as j|
|
|
|
|
create table t3 as select * from v1|
|
|
|
|
show create table t3|
|
|
|
|
Table Create Table
|
|
|
|
t3 CREATE TABLE `t3` (
|
|
|
|
`j` bigint(11) default NULL
|
|
|
|
) ENGINE=MyISAM DEFAULT CHARSET=latin1
|
|
|
|
select * from t3|
|
|
|
|
j
|
|
|
|
0
|
|
|
|
drop table t3|
|
|
|
|
drop view v1|
|
|
|
|
drop function bug12472|
|
2006-05-10 21:16:30 +02:00
|
|
|
DROP FUNCTION IF EXISTS bug18589_f1|
|
|
|
|
DROP PROCEDURE IF EXISTS bug18589_p1|
|
|
|
|
DROP PROCEDURE IF EXISTS bug18589_p2|
|
|
|
|
CREATE FUNCTION bug18589_f1(arg TEXT) RETURNS TEXT
|
|
|
|
BEGIN
|
|
|
|
RETURN CONCAT(arg, "");
|
|
|
|
END|
|
|
|
|
CREATE PROCEDURE bug18589_p1(arg TEXT, OUT ret TEXT)
|
|
|
|
BEGIN
|
|
|
|
SET ret = CONCAT(arg, "");
|
|
|
|
END|
|
|
|
|
CREATE PROCEDURE bug18589_p2(arg TEXT)
|
|
|
|
BEGIN
|
|
|
|
DECLARE v TEXT;
|
|
|
|
CALL bug18589_p1(arg, v);
|
|
|
|
SELECT v;
|
|
|
|
END|
|
|
|
|
SELECT bug18589_f1(REPEAT("a", 767))|
|
|
|
|
bug18589_f1(REPEAT("a", 767))
|
|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
|
|
|
SET @bug18589_v1 = ""|
|
|
|
|
CALL bug18589_p1(REPEAT("a", 767), @bug18589_v1)|
|
|
|
|
SELECT @bug18589_v1|
|
|
|
|
@bug18589_v1
|
|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
|
|
|
CALL bug18589_p2(REPEAT("a", 767))|
|
|
|
|
v
|
|
|
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
|
|
|
DROP FUNCTION bug18589_f1|
|
|
|
|
DROP PROCEDURE bug18589_p1|
|
|
|
|
DROP PROCEDURE bug18589_p2|
|
2006-05-18 12:44:15 +02:00
|
|
|
DROP FUNCTION IF EXISTS bug18037_f1|
|
|
|
|
DROP PROCEDURE IF EXISTS bug18037_p1|
|
|
|
|
DROP PROCEDURE IF EXISTS bug18037_p2|
|
|
|
|
CREATE FUNCTION bug18037_f1() RETURNS INT
|
|
|
|
BEGIN
|
|
|
|
RETURN @@server_id;
|
|
|
|
END|
|
|
|
|
CREATE PROCEDURE bug18037_p1()
|
|
|
|
BEGIN
|
|
|
|
DECLARE v INT DEFAULT @@server_id;
|
|
|
|
END|
|
|
|
|
CREATE PROCEDURE bug18037_p2()
|
|
|
|
BEGIN
|
|
|
|
CASE @@server_id
|
|
|
|
WHEN -1 THEN
|
|
|
|
SELECT 0;
|
|
|
|
ELSE
|
|
|
|
SELECT 1;
|
|
|
|
END CASE;
|
|
|
|
END|
|
|
|
|
SELECT bug18037_f1()|
|
|
|
|
bug18037_f1()
|
|
|
|
1
|
|
|
|
CALL bug18037_p1()|
|
|
|
|
CALL bug18037_p2()|
|
|
|
|
1
|
|
|
|
1
|
|
|
|
DROP FUNCTION bug18037_f1|
|
|
|
|
DROP PROCEDURE bug18037_p1|
|
|
|
|
DROP PROCEDURE bug18037_p2|
|
A fix and a test case for
Bug#19022 "Memory bug when switching db during trigger execution"
Bug#17199 "Problem when view calls function from another database."
Bug#18444 "Fully qualified stored function names don't work correctly in
SELECT statements"
Documentation note: this patch introduces a change in behaviour of prepared
statements.
This patch adds a few new invariants with regard to how THD::db should
be used. These invariants should be preserved in future:
- one should never refer to THD::db by pointer and always make a deep copy
(strmake, strdup)
- one should never compare two databases by pointer, but use strncmp or
my_strncasecmp
- TABLE_LIST object table->db should be always initialized in the parser or
by creator of the object.
For prepared statements it means that if the current database is changed
after a statement is prepared, the database that was current at prepare
remains active. This also means that you can not prepare a statement that
implicitly refers to the current database if the latter is not set.
This is not documented, and therefore needs documentation. This is NOT a
change in behavior for almost all SQL statements except:
- ALTER TABLE t1 RENAME t2
- OPTIMIZE TABLE t1
- ANALYZE TABLE t1
- TRUNCATE TABLE t1 --
until this patch t1 or t2 could be evaluated at the first execution of
prepared statement.
CURRENT_DATABASE() still works OK and is evaluated at every execution
of prepared statement.
Note, that in stored routines this is not an issue as the default
database is the database of the stored procedure and "use" statement
is prohibited in stored routines.
This patch makes obsolete the use of check_db_used (it was never used in the
old code too) and all other places that check for table->db and assign it
from THD::db if it's NULL, except the parser.
How this patch was created: THD::{db,db_length} were replaced with a
LEX_STRING, THD::db. All the places that refer to THD::{db,db_length} were
manually checked and:
- if the place uses thd->db by pointer, it was fixed to make a deep copy
- if a place compared two db pointers, it was fixed to compare them by value
(via strcmp/my_strcasecmp, whatever was approproate)
Then this intermediate patch was used to write a smaller patch that does the
same thing but without a rename.
TODO in 5.1:
- remove check_db_used
- deploy THD::set_db in mysql_change_db
See also comments to individual files.
mysql-test/r/create.result:
Modify the result file: a database can never be NULL.
mysql-test/r/ps.result:
Update test results (Bug#17199 et al)
mysql-test/r/sp.result:
Update test results (Bug#17199 et al)
mysql-test/t/create.test:
Update the id of the returned error.
mysql-test/t/ps.test:
Add test coverage for prepared statements and current database. In scope of
work on Bug#17199 "Problem when view calls function from another database."
mysql-test/t/sp.test:
Add a test case for Bug#17199 "Problem when view calls function from another
database." and Bug#18444 "Fully qualified stored function names don't work
correctly in SELECT statements". Test a complementary problem.
sql/item_strfunc.cc:
Touch the code that reads thd->db (cleanup).
sql/log_event.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/slave.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/slave.h:
Remove a declaration for a method that is used only in one module.
sql/sp.cc:
Rewrite sp_use_new_db: this is a cleanup that I needed in order to understand
this function and ensure that it has no bugs.
sql/sp.h:
Add a new declaration for sp_use_new_db (uses LEX_STRINGs) and a comment.
sql/sp_head.cc:
- drop sp_name_current_db_new - a creator of sp_name class that was used
when sp_name was created for an identifier without an explicitly initialized
database. Now we pass thd->db to constructor of sp_name right in the
parser.
- rewrite sp_head::init_strings: name->m_db is always set now
- use the new variant of sp_use_new_db
- we don't need to update thd->db with SP MEM_ROOT pointer anymore when
parsing a stored procedure, as noone will refer to it (yes!)
sql/sp_head.h:
- remove unneded methods and members
sql/sql_class.h:
- introduce 3 THD methods to work with THD::db:
.set_db to assign the current database
.reset_db to reset the current database (temporarily) or set it to NULL
.opt_copy_db_to - to deep-copy thd->db to a pointer if it's not NULL
sql/sql_db.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/sql_insert.cc:
- replace checks with asserts: table_list->db must be always set in the parser.
sql/sql_lex.h:
- add a comment
sql/sql_parse.cc:
- implement the invariant described in the changeset comment.
- remove juggling with lex->sphead in SQLCOM_CREATE_PROCEDURE:
now db_load_routine uses its own LEX object and doesn't damage the main
LEX.
- add DBUG_ASSERT(0) to unused "check_db_used"
sql/sql_table.cc:
- replace a check with an assert (table_ident->db)
sql/sql_trigger.cc:
While we are at it, replace direct access to thd->db with a method.
Should simplify future conversion of THD::db to LEX_STRING.
sql/sql_udf.cc:
- use thd->set_db instead of direct modification of to thd->db
sql/sql_view.cc:
- replace a check with an assert (view->db)
sql/sql_yacc.yy:
- make sure that we always copy table->db or name->db or ident->db or
select_lex->db from thd->db if the former is not set. If thd->db
is not set but is accessed, return an error.
sql/tztime.cc:
- be nice, never copy thd->db by pointer.
2006-06-26 22:47:52 +02:00
|
|
|
use test|
|
|
|
|
create table t3 (i int)|
|
|
|
|
insert into t3 values (1), (2)|
|
|
|
|
create database mysqltest1|
|
|
|
|
use mysqltest1|
|
|
|
|
create function bug17199() returns varchar(2) deterministic return 'ok'|
|
|
|
|
use test|
|
|
|
|
select *, mysqltest1.bug17199() from t3|
|
|
|
|
i mysqltest1.bug17199()
|
|
|
|
1 ok
|
|
|
|
2 ok
|
|
|
|
use mysqltest1|
|
|
|
|
create function bug18444(i int) returns int no sql deterministic return i + 1|
|
|
|
|
use test|
|
|
|
|
select mysqltest1.bug18444(i) from t3|
|
|
|
|
mysqltest1.bug18444(i)
|
|
|
|
2
|
|
|
|
3
|
|
|
|
drop database mysqltest1|
|
|
|
|
create database mysqltest1 charset=utf8|
|
|
|
|
create database mysqltest2 charset=utf8|
|
|
|
|
create procedure mysqltest1.p1()
|
|
|
|
begin
|
|
|
|
-- alters the default collation of database test
|
|
|
|
alter database character set koi8r;
|
|
|
|
end|
|
|
|
|
use mysqltest1|
|
|
|
|
call p1()|
|
|
|
|
show create database mysqltest1|
|
|
|
|
Database Create Database
|
|
|
|
mysqltest1 CREATE DATABASE `mysqltest1` /*!40100 DEFAULT CHARACTER SET koi8r */
|
|
|
|
show create database mysqltest2|
|
|
|
|
Database Create Database
|
|
|
|
mysqltest2 CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET utf8 */
|
|
|
|
alter database mysqltest1 character set utf8|
|
|
|
|
use mysqltest2|
|
|
|
|
call mysqltest1.p1()|
|
|
|
|
show create database mysqltest1|
|
|
|
|
Database Create Database
|
|
|
|
mysqltest1 CREATE DATABASE `mysqltest1` /*!40100 DEFAULT CHARACTER SET koi8r */
|
|
|
|
show create database mysqltest2|
|
|
|
|
Database Create Database
|
|
|
|
mysqltest2 CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET utf8 */
|
|
|
|
drop database mysqltest1|
|
|
|
|
drop database mysqltest2|
|
|
|
|
use test|
|
2006-06-22 17:29:48 +02:00
|
|
|
drop table if exists t3|
|
|
|
|
drop procedure if exists bug15217|
|
|
|
|
create table t3 as select 1|
|
|
|
|
create procedure bug15217()
|
|
|
|
begin
|
|
|
|
declare var1 char(255);
|
|
|
|
declare cur1 cursor for select * from t3;
|
|
|
|
open cur1;
|
|
|
|
fetch cur1 into var1;
|
|
|
|
select concat('data was: /', var1, '/');
|
|
|
|
close cur1;
|
|
|
|
end |
|
|
|
|
call bug15217()|
|
|
|
|
concat('data was: /', var1, '/')
|
|
|
|
data was: /1/
|
|
|
|
flush tables |
|
|
|
|
call bug15217()|
|
|
|
|
concat('data was: /', var1, '/')
|
|
|
|
data was: /1/
|
|
|
|
drop table t3|
|
|
|
|
drop procedure bug15217|
|
2005-03-07 17:16:37 +01:00
|
|
|
drop table t1,t2;
|