2003-01-17 14:38:05 +01:00
|
|
|
|
#
|
|
|
|
|
# Basic stored PROCEDURE tests
|
|
|
|
|
#
|
2004-08-26 12:54:30 +02:00
|
|
|
|
# Please keep this file free of --error cases and other
|
|
|
|
|
# things that will not run in a single debugged mysqld
|
|
|
|
|
# process (e.g. master-slave things).
|
2005-03-18 14:33:46 +01:00
|
|
|
|
#
|
|
|
|
|
# Test cases for bugs are added at the end. See template there.
|
|
|
|
|
#
|
|
|
|
|
# Tests that require --error go into sp-error.test
|
|
|
|
|
# Tests that require inndb go into sp_trans.test
|
|
|
|
|
# Tests that check privilege and security issues go to sp-security.test.
|
|
|
|
|
# Tests that require multiple connections, except security/privilege tests,
|
|
|
|
|
# go to sp-thread.
|
2005-07-01 15:25:51 +02:00
|
|
|
|
# Tests that uses 'goto' to into sp-goto.test (currently disabled)
|
2005-03-17 18:26:36 +01:00
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
use test;
|
|
|
|
|
|
2005-03-18 14:33:46 +01:00
|
|
|
|
# Test tables
|
|
|
|
|
#
|
|
|
|
|
# t1 and t2 are reused throughout the file, and dropped at the end.
|
|
|
|
|
# t3 and up are created and dropped when needed.
|
|
|
|
|
#
|
2003-01-17 14:38:05 +01:00
|
|
|
|
--disable_warnings
|
2005-07-30 10:19:57 +02:00
|
|
|
|
drop table if exists t1,t2,t3,t4;
|
2003-01-17 14:38:05 +01:00
|
|
|
|
--enable_warnings
|
|
|
|
|
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
|
|
|
|
);
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# Single statement, no params.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists foo42;
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
delete from t1;
|
|
|
|
|
drop procedure foo42;
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# Single statement, two IN params.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bar;
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
delete from t1;
|
|
|
|
|
# Don't drop procedure yet...
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
# Now for multiple statements...
|
2003-01-17 14:38:05 +01:00
|
|
|
|
delimiter |;
|
|
|
|
|
|
Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
- ITERATE in labelled BEGIN-END (not allowed).
- Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
- Empty BEGIN-END (now allowed).
- End label (now optional).
include/mysqld_error.h:
New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/r/sp.result:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
mysql-test/t/sp-error.test:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/t/sp.test:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
sql/lex.h:
New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
sql/sp_pcontext.h:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
End-labels in SPs loop and begin-end blocks are now optional.
SQLSTATE [VALUE] added to syntax for sqlstates.
Check for duplicate variable, condition and cursor declarations, but
only in the same scope.
Empty BEGIN-END statements now allowed.
Check if ITERATE is referring to a BEGIN label.
2003-11-13 19:34:56 +01:00
|
|
|
|
# Empty statement
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists empty|
|
|
|
|
|
--enable_warnings
|
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
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call empty()|
|
|
|
|
|
drop procedure empty|
|
|
|
|
|
|
|
|
|
|
# Scope test. This is legal (warnings might be possible in the future,
|
|
|
|
|
# but for the time being, we just accept it).
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists scope|
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
drop procedure scope|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# Two statements.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists two|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call two("one", "two", 3)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure two|
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# Simple test of local variables and SET.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists locset|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call locset("locset", 19)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure locset|
|
|
|
|
|
|
|
|
|
|
|
2004-01-14 12:47:03 +01:00
|
|
|
|
# In some contexts local variables are not recognized
|
|
|
|
|
# (and in some, you have to qualify the identifier).
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists setcontext|
|
|
|
|
|
--enable_warnings
|
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|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure setcontext|
|
|
|
|
|
|
|
|
|
|
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
|
# Set things to null
|
|
|
|
|
create table t3 ( d date, i int, f double, s varchar(32) )|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists nullset|
|
|
|
|
|
--enable_warnings
|
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");
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call nullset()|
|
|
|
|
|
select * from t3|
|
|
|
|
|
drop table t3|
|
|
|
|
|
drop procedure nullset|
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# The peculiar (non-standard) mixture of variables types in SET.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists mixset|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call mixset("mixset", 19)|
|
|
|
|
|
show variables like 'max_join_size'|
|
|
|
|
|
select id,data,@z from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure mixset|
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# Multiple CALL statements, one with OUT parameter.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists zip|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
# SET local variables and OUT parameter.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists zap|
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
end|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call zip("zip", 99)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure zip|
|
|
|
|
|
drop procedure bar|
|
|
|
|
|
|
2003-10-16 15:45:27 +02:00
|
|
|
|
# Top-level OUT parameter
|
|
|
|
|
call zap(7, @zap)|
|
|
|
|
|
select @zap|
|
|
|
|
|
|
|
|
|
|
drop procedure zap|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
2003-05-23 15:32:31 +02:00
|
|
|
|
# "Deep" calls...
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists c1|
|
|
|
|
|
--enable_warnings
|
2003-05-23 15:32:31 +02:00
|
|
|
|
create procedure c1(x int)
|
|
|
|
|
call c2("c", x)|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists c2|
|
|
|
|
|
--enable_warnings
|
2003-05-23 15:32:31 +02:00
|
|
|
|
create procedure c2(s char(16), x int)
|
|
|
|
|
call c3(x, s)|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists c3|
|
|
|
|
|
--enable_warnings
|
2003-05-23 15:32:31 +02:00
|
|
|
|
create procedure c3(x int, s char(16))
|
|
|
|
|
call c4("level", x, s)|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists c4|
|
|
|
|
|
--enable_warnings
|
2003-05-23 15:32:31 +02:00
|
|
|
|
create procedure c4(l char(8), x int, s char(16))
|
|
|
|
|
insert into t1 values (concat(l,s), x)|
|
|
|
|
|
|
|
|
|
|
call c1(42)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure c1|
|
|
|
|
|
drop procedure c2|
|
|
|
|
|
drop procedure c3|
|
|
|
|
|
drop procedure c4|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# INOUT test
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists iotest|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists inc2|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists inc|
|
|
|
|
|
--enable_warnings
|
2003-01-17 14:38:05 +01:00
|
|
|
|
create procedure inc(inout io int)
|
|
|
|
|
set io = io + 1|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call iotest("io1", "io2", 1)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure iotest|
|
|
|
|
|
drop procedure inc2|
|
|
|
|
|
|
2003-10-16 15:45:27 +02:00
|
|
|
|
# Propagating top-level @-vars
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists incr|
|
|
|
|
|
--enable_warnings
|
2003-10-16 15:45:27 +02:00
|
|
|
|
create procedure incr(inout x int)
|
|
|
|
|
call inc(x)|
|
|
|
|
|
|
|
|
|
|
# Before
|
|
|
|
|
select @zap|
|
|
|
|
|
call incr(@zap)|
|
|
|
|
|
# After
|
|
|
|
|
select @zap|
|
|
|
|
|
|
|
|
|
|
drop procedure inc|
|
|
|
|
|
drop procedure incr|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
|
|
|
|
# Call-by-value test
|
|
|
|
|
# The expected result is:
|
|
|
|
|
# ("cbv2", 4)
|
|
|
|
|
# ("cbv1", 4711)
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists cbv1|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists cbv2|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call cbv1()|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure cbv1|
|
|
|
|
|
drop procedure cbv2|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
2003-04-27 17:35:54 +02:00
|
|
|
|
# Subselect arguments
|
|
|
|
|
|
|
|
|
|
insert into t2 values ("a", 1, 1.1), ("b", 2, 1.2), ("c", 3, 1.3)|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists sub1|
|
|
|
|
|
--enable_warnings
|
2003-04-27 17:35:54 +02:00
|
|
|
|
create procedure sub1(id char(16), x int)
|
|
|
|
|
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
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists sub2|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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|
|
2003-04-27 17:35:54 +02:00
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists sub3|
|
|
|
|
|
--enable_warnings
|
2003-04-27 17:35:54 +02:00
|
|
|
|
create function sub3(i int) returns int
|
|
|
|
|
return i+1|
|
|
|
|
|
|
|
|
|
|
call sub1("sub1a", (select 7))|
|
|
|
|
|
call sub1("sub1b", (select max(i) from t2))|
|
|
|
|
|
call sub1("sub1c", (select i,d from t2 limit 1))|
|
|
|
|
|
call sub1("sub1d", (select 1 from (select 1) a))|
|
2005-06-10 16:14:01 +02:00
|
|
|
|
call sub2("sub2")|
|
2003-04-27 17:35:54 +02:00
|
|
|
|
select * from t1|
|
|
|
|
|
select sub3((select max(i) from t2))|
|
|
|
|
|
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-04-27 17:35:54 +02: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|
|
2003-04-27 17:35:54 +02:00
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
# Basic tests of the flow control constructs
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
|
|
|
|
# Just test on 'x'...
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists a0|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end while|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call a0(3)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure a0|
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# The same, but with a more traditional test.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists a|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end while|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call a(3)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure a|
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# REPEAT
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists b|
|
|
|
|
|
--enable_warnings
|
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-01-23 14:00:31 +01:00
|
|
|
|
until x = 0 end repeat|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call b(3)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure b|
|
|
|
|
|
|
|
|
|
|
|
2003-01-23 14:00:32 +01:00
|
|
|
|
# Check that repeat isn't parsed the wrong way
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists b2|
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
until x = 0 end repeat|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
|
2003-01-23 14:00:32 +01:00
|
|
|
|
# We don't actually want to call it.
|
|
|
|
|
drop procedure b2|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# Labelled WHILE with ITERATE (pointless really)
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists c|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end while hmm|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call c(3)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure c|
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# Labelled WHILE with LEAVE
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists d|
|
|
|
|
|
--enable_warnings
|
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);
|
Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
- ITERATE in labelled BEGIN-END (not allowed).
- Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
- Empty BEGIN-END (now allowed).
- End label (now optional).
include/mysqld_error.h:
New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/r/sp.result:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
mysql-test/t/sp-error.test:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/t/sp.test:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
sql/lex.h:
New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
sql/sp_pcontext.h:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
End-labels in SPs loop and begin-end blocks are now optional.
SQLSTATE [VALUE] added to syntax for sqlstates.
Check for duplicate variable, condition and cursor declarations, but
only in the same scope.
Empty BEGIN-END statements now allowed.
Check if ITERATE is referring to a BEGIN label.
2003-11-13 19:34:56 +01:00
|
|
|
|
end while|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call d(3)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure d|
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# LOOP, with simple IF statement
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists e|
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
end loop foo|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call e(3)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure e|
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# A full IF statement
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists f|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end if|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call f(-2)|
|
|
|
|
|
call f(0)|
|
|
|
|
|
call f(4)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure f|
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# This form of CASE is really just syntactic sugar for IF-ELSEIF-...
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists g|
|
|
|
|
|
--enable_warnings
|
2003-01-17 14:38:05 +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);
|
|
|
|
|
end case|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call g(-42)|
|
|
|
|
|
call g(0)|
|
|
|
|
|
call g(1)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure g|
|
|
|
|
|
|
|
|
|
|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
# The "simple CASE"
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists h|
|
|
|
|
|
--enable_warnings
|
2003-01-17 14:38:05 +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);
|
|
|
|
|
end case|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call h(0)|
|
|
|
|
|
call h(1)|
|
|
|
|
|
call h(17)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure h|
|
|
|
|
|
|
|
|
|
|
|
Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
- ITERATE in labelled BEGIN-END (not allowed).
- Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
- Empty BEGIN-END (now allowed).
- End label (now optional).
include/mysqld_error.h:
New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/r/sp.result:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
mysql-test/t/sp-error.test:
New error tests for ITERATE in begin-end block and duplicate variables,
conditions and cursors.
mysql-test/t/sp.test:
New tests for empty begin-end blocks, overriding local variables outside scope
only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
declarations.
sql/lex.h:
New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
sql/sp_pcontext.h:
Keep track on scope limits for error checking of duplicate variables,
conditions and cursors.
Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
End-labels in SPs loop and begin-end blocks are now optional.
SQLSTATE [VALUE] added to syntax for sqlstates.
Check for duplicate variable, condition and cursor declarations, but
only in the same scope.
Empty BEGIN-END statements now allowed.
Check if ITERATE is referring to a BEGIN label.
2003-11-13 19:34:56 +01:00
|
|
|
|
# It's actually possible to LEAVE a BEGIN-END block
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists i|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end foo|
|
|
|
|
|
|
|
|
|
|
call i(0)|
|
|
|
|
|
call i(3)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure i|
|
|
|
|
|
|
|
|
|
|
|
2003-12-16 18:09:22 +01:00
|
|
|
|
# SELECT with one of more result set sent back to the clinet
|
|
|
|
|
insert into t1 values ("foo", 3), ("bar", 19)|
|
|
|
|
|
insert into t2 values ("x", 9, 4.1), ("y", -1, 19.2), ("z", 3, 2.2)|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists sel1|
|
|
|
|
|
--enable_warnings
|
2003-12-16 18:09:22 +01:00
|
|
|
|
create procedure sel1()
|
|
|
|
|
begin
|
|
|
|
|
select * from t1;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call sel1()|
|
|
|
|
|
drop procedure sel1|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists sel2|
|
|
|
|
|
--enable_warnings
|
2003-12-16 18:09:22 +01:00
|
|
|
|
create procedure sel2()
|
|
|
|
|
begin
|
|
|
|
|
select * from t1;
|
|
|
|
|
select * from t2;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call sel2()|
|
|
|
|
|
drop procedure sel2|
|
|
|
|
|
delete from t1|
|
|
|
|
|
delete from t2|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
# SELECT INTO local variables
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists into_test|
|
|
|
|
|
--enable_warnings
|
2003-02-02 17:41:21 +01:00
|
|
|
|
create procedure into_test(x char(16), y int)
|
|
|
|
|
begin
|
|
|
|
|
insert into test.t1 values (x, y);
|
|
|
|
|
select id,data into x,y from test.t1 limit 1;
|
|
|
|
|
insert into test.t1 values (concat(x, "2"), y+2);
|
|
|
|
|
end|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call into_test("into", 100)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure into_test|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# SELECT INTO with a mix of local and global variables
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists into_tes2|
|
|
|
|
|
--enable_warnings
|
2003-02-02 17:41:21 +01:00
|
|
|
|
create procedure into_test2(x char(16), y int)
|
2003-01-18 17:21:13 +01:00
|
|
|
|
begin
|
|
|
|
|
insert into test.t1 values (x, y);
|
2003-02-02 17:41:21 +01:00
|
|
|
|
select id,data into x,@z from test.t1 limit 1;
|
|
|
|
|
insert into test.t1 values (concat(x, "2"), y+2);
|
2003-01-18 17:21:13 +01:00
|
|
|
|
end|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
call into_test2("into", 100)|
|
|
|
|
|
select id,data,@z from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure into_test2|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
|
|
|
|
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
|
# SELECT * INTO ... (bug test)
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists into_test3|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
insert into t1 values ("into3", 19)|
|
|
|
|
|
# Two call needed for bug test
|
|
|
|
|
call into_test3()|
|
|
|
|
|
call into_test3()|
|
|
|
|
|
select * from t2|
|
|
|
|
|
delete from t1|
|
|
|
|
|
delete from t2|
|
|
|
|
|
drop procedure into_test3|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# SELECT INTO with no data is a warning ("no data", which we will
|
|
|
|
|
# not see normally). When not caught, execution proceeds.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists into_test4|
|
|
|
|
|
--enable_warnings
|
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);
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
delete from t1|
|
|
|
|
|
create table t3 ( s char(16), d int)|
|
|
|
|
|
call into_test4()|
|
|
|
|
|
select * from t3|
|
|
|
|
|
insert into t1 values ("i4", 77)|
|
|
|
|
|
call into_test4()|
|
|
|
|
|
select * from t3|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop table t3|
|
|
|
|
|
drop procedure into_test4|
|
|
|
|
|
|
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
# These two (and the two procedures above) caused an assert() to fail in
|
|
|
|
|
# sql_base.cc:lock_tables() at some point.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists into_outfile|
|
|
|
|
|
--enable_warnings
|
2003-02-19 12:42:32 +01:00
|
|
|
|
create procedure into_outfile(x char(16), y int)
|
|
|
|
|
begin
|
|
|
|
|
insert into test.t1 values (x, y);
|
|
|
|
|
select * into outfile "/tmp/spout" from test.t1;
|
|
|
|
|
insert into test.t1 values (concat(x, "2"), y+2);
|
|
|
|
|
end|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
system rm -f /tmp/spout|
|
|
|
|
|
call into_outfile("ofile", 1)|
|
|
|
|
|
system rm -f /tmp/spout|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure into_outfile|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists into_dumpfile|
|
|
|
|
|
--enable_warnings
|
2003-02-19 12:42:32 +01:00
|
|
|
|
create procedure into_dumpfile(x char(16), y int)
|
|
|
|
|
begin
|
|
|
|
|
insert into test.t1 values (x, y);
|
|
|
|
|
select * into dumpfile "/tmp/spdump" from test.t1 limit 1;
|
|
|
|
|
insert into test.t1 values (concat(x, "2"), y+2);
|
|
|
|
|
end|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
system rm -f /tmp/spdump|
|
|
|
|
|
call into_dumpfile("dfile", 1)|
|
|
|
|
|
system rm -f /tmp/spdump|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure into_dumpfile|
|
2003-02-02 17:41:21 +01:00
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists create_select|
|
|
|
|
|
--enable_warnings
|
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-02-19 12:42:32 +01:00
|
|
|
|
end|
|
2003-02-02 17:41:21 +01:00
|
|
|
|
|
2003-04-04 15:47:43 +02:00
|
|
|
|
call create_select("cs", 90)|
|
|
|
|
|
select * from t1, t3|
|
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-04-04 15:47:43 +02:00
|
|
|
|
delete from t1|
|
2003-02-19 12:42:32 +01:00
|
|
|
|
drop procedure create_select|
|
2003-01-17 14:38:05 +01:00
|
|
|
|
|
2003-04-04 15:47:43 +02:00
|
|
|
|
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
|
# A minimal, constant FUNCTION.
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists e|
|
|
|
|
|
--enable_warnings
|
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
|
|
|
|
|
return 2.7182818284590452354|
|
|
|
|
|
|
2003-02-27 19:08:52 +01:00
|
|
|
|
set @e = e()|
|
|
|
|
|
select e(), @e|
|
2003-02-26 19:22:29 +01:00
|
|
|
|
|
|
|
|
|
# A minimal function with one argument
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists inc|
|
|
|
|
|
--enable_warnings
|
2003-02-26 19:22:29 +01:00
|
|
|
|
create function inc(i int) returns int
|
|
|
|
|
return i+1|
|
|
|
|
|
|
|
|
|
|
select inc(1), inc(99), inc(-71)|
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
|
|
2003-02-26 19:22:29 +01:00
|
|
|
|
# A minimal function with two arguments
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists mul|
|
|
|
|
|
--enable_warnings
|
2003-02-26 19:22:29 +01:00
|
|
|
|
create function mul(x int, y int) returns int
|
|
|
|
|
return x*y|
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
|
|
2003-02-26 19:22:29 +01:00
|
|
|
|
select mul(1,1), mul(3,5), mul(4711, 666)|
|
|
|
|
|
|
2003-02-27 19:08:52 +01:00
|
|
|
|
# A minimal string function
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists append|
|
|
|
|
|
--enable_warnings
|
2003-02-27 19:08:52 +01:00
|
|
|
|
create function append(s1 char(8), s2 char(8)) returns char(16)
|
|
|
|
|
return concat(s1, s2)|
|
|
|
|
|
|
|
|
|
|
select append("foo", "bar")|
|
|
|
|
|
|
2003-02-26 19:22:29 +01:00
|
|
|
|
# A function with flow control
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists fac|
|
|
|
|
|
--enable_warnings
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
|
create function fac(n int unsigned) returns bigint unsigned
|
|
|
|
|
begin
|
2003-03-30 13:25:43 +02:00
|
|
|
|
declare f bigint unsigned default 1;
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
|
|
|
|
|
|
while n > 1 do
|
|
|
|
|
set f = f * n;
|
|
|
|
|
set n = n - 1;
|
|
|
|
|
end while;
|
|
|
|
|
return f;
|
|
|
|
|
end|
|
|
|
|
|
|
2003-02-27 19:08:52 +01:00
|
|
|
|
select fac(1), fac(2), fac(5), fac(10)|
|
2003-02-26 19:22:29 +01:00
|
|
|
|
|
2003-03-02 19:17:41 +01:00
|
|
|
|
# Nested calls
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists fun|
|
|
|
|
|
--enable_warnings
|
2003-03-02 19:17:41 +01:00
|
|
|
|
create function fun(d double, i int, u int unsigned) returns double
|
|
|
|
|
return mul(inc(i), fac(u)) / e()|
|
|
|
|
|
|
|
|
|
|
select fun(2.3, 3, 5)|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Various function calls in differen statements
|
|
|
|
|
|
|
|
|
|
insert into t2 values (append("xxx", "yyy"), mul(4,3), e())|
|
|
|
|
|
insert into t2 values (append("a", "b"), mul(2,mul(3,4)), fun(1.7, 4, 6))|
|
|
|
|
|
|
2005-01-04 12:46:53 +01:00
|
|
|
|
# Disable PS because double's give a bit different values
|
2005-01-03 20:04:33 +01:00
|
|
|
|
--disable_ps_protocol
|
2003-03-02 19:17:41 +01:00
|
|
|
|
select * from t2 where s = append("a", "b")|
|
|
|
|
|
select * from t2 where i = mul(4,3) or i = mul(mul(3,4),2)|
|
|
|
|
|
select * from t2 where d = e()|
|
|
|
|
|
select * from t2|
|
2005-01-03 20:04:33 +01:00
|
|
|
|
--enable_ps_protocol
|
2003-03-02 19:17:41 +01:00
|
|
|
|
delete from t2|
|
|
|
|
|
|
2003-02-26 19:22:29 +01:00
|
|
|
|
drop function e|
|
|
|
|
|
drop function inc|
|
|
|
|
|
drop function mul|
|
2003-02-27 19:08:52 +01:00
|
|
|
|
drop function append|
|
2003-03-02 19:17:41 +01:00
|
|
|
|
drop function fun|
|
Most of the groundwork for sprint task 729 (implement FUNCTIONs).
Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...
Docs/sp-implemented.txt:
Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
De-UDFed some symbol names, as they are now used for SPs as well.
Added RETURN_SYM.
sql/share/czech/errmsg.txt:
New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
New error message for misuse of RETURN.
sql/sp.cc:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp.h:
Major rehack to accomodate FUNCTIONs, and to make it easier to add
future in-memory cache of prepared SPs.
sql/sp_head.cc:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
New stored FUNCTION commands.
sql/sql_parse.cc:
Added FUNCTION support ("drop" merged with the old UDF code), and made some
additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
Some former UDF specific symbols renamed.
Added CREATE FUNCTION parsing.
DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
syntax.
RETURN statement added, but still a no-op.
2003-02-21 17:37:05 +01:00
|
|
|
|
|
2003-03-03 15:03:19 +01:00
|
|
|
|
|
2003-09-16 14:26:08 +02:00
|
|
|
|
#
|
|
|
|
|
# CONDITIONs and HANDLERs
|
|
|
|
|
#
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists hndlr1|
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call hndlr1(42)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure hndlr1|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists hndlr2|
|
|
|
|
|
--enable_warnings
|
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;
|
2003-09-16 14:26:08 +02:00
|
|
|
|
|
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 ("hndlr2", val, 2); # Too many values
|
2003-09-16 14:26:08 +02:00
|
|
|
|
end;
|
|
|
|
|
|
|
|
|
|
insert into test.t1 values ("hndlr2", x);
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call hndlr2(42)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure hndlr2|
|
|
|
|
|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists hndlr3|
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call hndlr3(3)|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure hndlr3|
|
|
|
|
|
|
2003-10-17 17:13:49 +02:00
|
|
|
|
|
|
|
|
|
# Variables might be uninitialized when using handlers
|
|
|
|
|
# (Otherwise the compiler can detect if a variable is not set, but
|
|
|
|
|
# not in this case.)
|
2003-10-20 16:59:45 +02:00
|
|
|
|
create table t3 ( id char(16), data int )|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists hndlr4|
|
|
|
|
|
--enable_warnings
|
2003-10-17 17:13:49 +02:00
|
|
|
|
create procedure hndlr4()
|
|
|
|
|
begin
|
|
|
|
|
declare x int default 0;
|
|
|
|
|
declare val int; # No default
|
2003-12-01 18:24:09 +01:00
|
|
|
|
declare continue handler for sqlstate '02000' set x=1;
|
2003-10-17 17:13:49 +02:00
|
|
|
|
|
2003-10-20 16:59:45 +02:00
|
|
|
|
select data into val from test.t3 where id='z' limit 1; # No hits
|
2003-10-17 17:13:49 +02:00
|
|
|
|
|
2003-10-20 16:59:45 +02:00
|
|
|
|
insert into test.t3 values ('z', val);
|
2003-10-17 17:13:49 +02:00
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call hndlr4()|
|
2003-10-20 16:59:45 +02:00
|
|
|
|
select * from t3|
|
|
|
|
|
drop table t3|
|
2003-10-17 17:13:49 +02:00
|
|
|
|
drop procedure hndlr4|
|
|
|
|
|
|
|
|
|
|
|
2003-10-10 16:57:21 +02:00
|
|
|
|
#
|
|
|
|
|
# Cursors
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists cur1|
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
insert into t2 values ("foo", 42, -1.9), ("bar", 3, 12.1), ("zap", 666, -3.14)|
|
|
|
|
|
call cur1()|
|
|
|
|
|
select * from t1|
|
2003-10-14 12:59:28 +02:00
|
|
|
|
drop procedure cur1|
|
|
|
|
|
|
|
|
|
|
create table t3 ( s char(16), i int )|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists cur2|
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call cur2()|
|
|
|
|
|
select * from t3|
|
2003-10-10 16:57:21 +02:00
|
|
|
|
delete from t1|
|
|
|
|
|
delete from t2|
|
2003-10-14 12:59:28 +02:00
|
|
|
|
drop table t3|
|
|
|
|
|
drop procedure cur2|
|
2003-09-16 14:26:08 +02:00
|
|
|
|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
|
In order to make ALTER PROCEDURE|FUNCTION work correctly, and in general to
make characteristics (and SHOW) work right, we had to separate the old
definition blob in the mysql.proc table into separate fields for parameters,
return type, and body, and handle the characteristics (like SQL SECURITY)
separately... and then reassemble the CREATE string for parsing, of course.
This is rather ugly, mostly the parser bit. (Hopefully that will be better
with the new parser.)
Docs/sp-imp-spec.txt:
Separated the definitions string of the procedure into different columns
in the mysql.proc schema.
mysql-test/r/sp.result:
New characteristics tests.
mysql-test/t/sp.test:
New characteristics tests.
scripts/mysql_create_system_tables.sh:
Separated the definitions string of the procedure into different columns
in the mysql.proc schema.
scripts/mysql_fix_privilege_tables.sql:
Separated the definitions string of the procedure into different columns
in the mysql.proc schema.
sql/sp.cc:
Separated the definitions string of the procedure into different columns.
Rewrote much of the code related this (have a assemble the definition
string from its different parts now) and the way characteristics are now
handled, in order to make ALTER actually work.
sql/sp.h:
Changed prototypes.
sql/sp_head.cc:
Rewrote much of the code related to the new mysql.proc schema with separate
definition fields (have to assemble the definition string from its different
parts now) and the way characteristics are now handled, in order to make ALTER
actually work.
sql/sp_head.h:
Separated the different parts of the definition strings: name, parameters,
return type (for functions) and body.
sql/sql_yacc.yy:
Separated the different parts of the definition strings: name, parameters,
return type (for functions) and body.
This is ugly and messy; hopefully there's a more elegant way to do this
when the new parser is installed.
2003-12-12 14:05:29 +01:00
|
|
|
|
# The few characteristics we parse
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists chistics|
|
|
|
|
|
--enable_warnings
|
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()
|
2004-10-14 18:07:09 +02:00
|
|
|
|
language sql
|
|
|
|
|
modifies sql data
|
|
|
|
|
not deterministic
|
|
|
|
|
sql security definer
|
|
|
|
|
comment 'Characteristics procedure test'
|
|
|
|
|
insert into t1 values ("chistics", 1)|
|
|
|
|
|
|
|
|
|
|
show create procedure 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
|
|
|
|
# Call it, just to make sure.
|
|
|
|
|
call chistics()|
|
|
|
|
|
select * from t1|
|
|
|
|
|
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|
|
|
|
|
|
drop procedure 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
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists chistics|
|
|
|
|
|
--enable_warnings
|
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
|
2004-10-14 18:07:09 +02:00
|
|
|
|
language sql
|
|
|
|
|
deterministic
|
|
|
|
|
sql security invoker
|
|
|
|
|
comment 'Characteristics procedure test'
|
|
|
|
|
return 42|
|
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
|
|
|
|
|
2004-10-14 18:07:09 +02:00
|
|
|
|
show create function 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
|
|
|
|
# Call it, just to make sure.
|
|
|
|
|
select chistics()|
|
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|
|
|
|
|
|
drop function 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
|
|
|
|
|
|
|
|
|
|
2003-12-11 12:23:50 +01:00
|
|
|
|
# Check mode settings
|
|
|
|
|
insert into t1 values ("foo", 1), ("bar", 2), ("zip", 3)|
|
|
|
|
|
|
|
|
|
|
set @@sql_mode = 'ANSI'|
|
|
|
|
|
delimiter $|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists modes$
|
|
|
|
|
--enable_warnings
|
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;
|
|
|
|
|
end$
|
|
|
|
|
delimiter |$
|
|
|
|
|
set @@sql_mode = ''|
|
|
|
|
|
|
|
|
|
|
set sql_select_limit = 1|
|
|
|
|
|
call modes(@c1, @c2)|
|
|
|
|
|
set sql_select_limit = default|
|
|
|
|
|
|
|
|
|
|
select @c1, @c2|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure modes|
|
|
|
|
|
|
|
|
|
|
|
2004-03-22 14:44:41 +01:00
|
|
|
|
# Check that dropping a database without routines works.
|
|
|
|
|
# (Dropping with routines is tested in sp-security.test)
|
|
|
|
|
# First an empty db.
|
|
|
|
|
create database sp_db1|
|
|
|
|
|
drop database sp_db1|
|
|
|
|
|
|
|
|
|
|
# Again, with a table.
|
|
|
|
|
create database sp_db2|
|
|
|
|
|
use sp_db2|
|
|
|
|
|
# Just put something in here...
|
|
|
|
|
create table t3 ( s char(4), t int )|
|
|
|
|
|
insert into t3 values ("abcd", 42), ("dcba", 666)|
|
|
|
|
|
use test|
|
|
|
|
|
drop database sp_db2|
|
|
|
|
|
|
|
|
|
|
# And yet again, with just a procedure.
|
|
|
|
|
create database sp_db3|
|
|
|
|
|
use sp_db3|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists dummy|
|
|
|
|
|
--enable_warnings
|
2004-03-22 14:44:41 +01:00
|
|
|
|
create procedure dummy(out x int)
|
|
|
|
|
set x = 42|
|
|
|
|
|
use test|
|
|
|
|
|
drop database sp_db3|
|
|
|
|
|
# Check that it's gone
|
|
|
|
|
select type,db,name from mysql.proc where db = 'sp_db3'|
|
|
|
|
|
|
|
|
|
|
|
2004-05-04 13:45:20 +02:00
|
|
|
|
# ROW_COUNT() function after a CALL
|
|
|
|
|
# We test the other cases here too, although it's not strictly SP specific
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists rc|
|
|
|
|
|
--enable_warnings
|
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()|
|
2005-01-03 20:04:33 +01:00
|
|
|
|
--disable_ps_protocol
|
2004-05-04 13:45:20 +02:00
|
|
|
|
update t1 set data=42 where id = "b";
|
|
|
|
|
select row_count()|
|
2005-01-03 20:04:33 +01:00
|
|
|
|
--enable_ps_protocol
|
2004-05-04 13:45:20 +02:00
|
|
|
|
delete from t1|
|
|
|
|
|
select row_count()|
|
|
|
|
|
delete from t1|
|
|
|
|
|
select row_count()|
|
2004-05-04 17:18:47 +02:00
|
|
|
|
select * from t1|
|
|
|
|
|
select row_count()|
|
2004-05-04 13:45:20 +02:00
|
|
|
|
drop procedure rc|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
#
|
|
|
|
|
# Let us test how well new locking scheme works.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# Let us prepare playground
|
|
|
|
|
--disable_warnings
|
|
|
|
|
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|
|
|
|
|
|
drop view if exists v0|
|
|
|
|
|
drop view if exists v1|
|
|
|
|
|
drop view if exists v2|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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) |
|
|
|
|
|
|
|
|
|
|
# Test the simplest function using tables
|
|
|
|
|
create function f1() returns int
|
|
|
|
|
return (select sum(data) from t1)|
|
|
|
|
|
select f1()|
|
|
|
|
|
# This should work too (and give 2 rows as result)
|
|
|
|
|
select id, f1() from t1|
|
|
|
|
|
|
|
|
|
|
# Function which uses two instances of table simultaneously
|
|
|
|
|
create function f2() returns int
|
|
|
|
|
return (select data from t1 where data <= (select sum(data) from t1) limit 1)|
|
|
|
|
|
select f2()|
|
|
|
|
|
select id, f2() from t1|
|
|
|
|
|
|
|
|
|
|
# Function which uses the same table twice in different queries
|
|
|
|
|
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()|
|
|
|
|
|
select id, f3() from t1|
|
|
|
|
|
|
|
|
|
|
# Calling two functions using same table
|
|
|
|
|
select f1(), f3()|
|
|
|
|
|
select id, f1(), f3() from t1|
|
|
|
|
|
|
|
|
|
|
# Function which uses two different tables
|
|
|
|
|
create function f4() returns double
|
|
|
|
|
return (select d from t1, t2 where t1.data = t2.i and t1.id= "b")|
|
|
|
|
|
select f4()|
|
|
|
|
|
select s, f4() from t2|
|
|
|
|
|
|
|
|
|
|
# Recursive functions which due to this recursion require simultaneous
|
|
|
|
|
# access to several instance of the same table won't work
|
|
|
|
|
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)|
|
|
|
|
|
# This should generate an error about insuficient number of tables locked
|
2005-07-31 11:49:55 +02:00
|
|
|
|
# Now this crash server
|
2005-09-01 20:02:08 +02:00
|
|
|
|
--disable_parsing # until bug#11394 fix
|
2005-07-31 11:49:55 +02:00
|
|
|
|
--error 1100
|
|
|
|
|
select f5(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
|
|
|
|
# But now it simply miserably fails because we are trying to use the same
|
|
|
|
|
# lex on the next iteration :/ It should generate some error too...
|
2005-07-31 11:49:55 +02:00
|
|
|
|
select f5(3)|
|
|
|
|
|
--enable_parsing
|
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
|
|
|
|
|
|
|
|
|
# OTOH this should work
|
|
|
|
|
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()|
|
|
|
|
|
select id, f6() from t1|
|
|
|
|
|
|
|
|
|
|
# TODO Test temporary table handling
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Let us test how new locking work with views
|
|
|
|
|
#
|
|
|
|
|
# The most trivial view
|
|
|
|
|
create view v1 (a) as select f1()|
|
|
|
|
|
select * from v1|
|
|
|
|
|
select id, a from t1, v1|
|
|
|
|
|
select * from v1, v1 as v|
|
|
|
|
|
# A bit more complex construction
|
|
|
|
|
create view v2 (a) as select a*10 from v1|
|
|
|
|
|
select * from v2|
|
|
|
|
|
select id, a from t1, v2|
|
|
|
|
|
select * from v1, v2|
|
|
|
|
|
|
|
|
|
|
# Nice example where the same view is used on
|
|
|
|
|
# on different expression levels
|
|
|
|
|
create function f8 () returns int
|
|
|
|
|
return (select count(*) from v2)|
|
|
|
|
|
|
|
|
|
|
select *, f8() from v1|
|
|
|
|
|
|
|
|
|
|
# Let us test what will happen if function is missing
|
|
|
|
|
drop function f1|
|
|
|
|
|
--error 1356
|
|
|
|
|
select * from v1|
|
|
|
|
|
|
|
|
|
|
# And what will happen if we have recursion which involves
|
|
|
|
|
# views and functions ?
|
|
|
|
|
create function f1() returns int
|
|
|
|
|
return (select sum(data) from t1) + (select sum(data) from v1)|
|
2005-07-09 19:51:59 +02:00
|
|
|
|
# This queries will crash server because we can't use LEX in
|
|
|
|
|
# reenterable fashion yet. Patch disabling recursion will heal this.
|
2005-07-31 11:49:55 +02:00
|
|
|
|
--disable_parsing
|
|
|
|
|
select f1()|
|
|
|
|
|
select * from v1|
|
|
|
|
|
select * from v2|
|
|
|
|
|
--enable_parsing
|
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
|
|
|
|
# Back to the normal cases
|
|
|
|
|
drop function f1|
|
|
|
|
|
create function f1() returns int
|
|
|
|
|
return (select sum(data) from t1)|
|
|
|
|
|
|
|
|
|
|
# Let us also test some weird cases where no real tables is used
|
|
|
|
|
create function f0() returns int
|
|
|
|
|
return (select * from (select 100) as r)|
|
|
|
|
|
select f0()|
|
|
|
|
|
select *, f0() from (select 1) as t|
|
|
|
|
|
create view v0 as select f0()|
|
|
|
|
|
select * from v0|
|
|
|
|
|
select *, f0() from v0|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Let us test how well prelocking works with explicit LOCK TABLES.
|
|
|
|
|
#
|
|
|
|
|
# Nowdays we have to lock mysql.proc to be able to read SP definitions.
|
|
|
|
|
# But Monty was going to fix this.
|
|
|
|
|
lock tables t1 read, t1 as t11 read, mysql.proc read|
|
|
|
|
|
# These should work well
|
|
|
|
|
select f3()|
|
|
|
|
|
select id, f3() from t1 as t11|
|
|
|
|
|
# Degenerate cases work too :)
|
|
|
|
|
select f0()|
|
|
|
|
|
select * from v0|
|
|
|
|
|
select *, f0() from v0, (select 123) as d1|
|
|
|
|
|
# But these should not !
|
|
|
|
|
--error 1100
|
|
|
|
|
select id, f3() from t1|
|
|
|
|
|
--error 1100
|
|
|
|
|
select f4()|
|
|
|
|
|
unlock tables|
|
|
|
|
|
|
|
|
|
|
# Let us test how LOCK TABLES which implicitly depends on functions
|
|
|
|
|
# works
|
|
|
|
|
lock tables v2 read, mysql.proc read|
|
|
|
|
|
select * from v2|
|
|
|
|
|
select * from v1|
|
|
|
|
|
# These should not work as we have too little instances of tables locked
|
|
|
|
|
--error 1100
|
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 1100
|
|
|
|
|
select f4()|
|
|
|
|
|
unlock tables|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Cleanup
|
|
|
|
|
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|
|
|
|
|
|
drop view v0|
|
|
|
|
|
drop view v1|
|
|
|
|
|
drop view v2|
|
|
|
|
|
delete from t1 |
|
|
|
|
|
delete from t2 |
|
|
|
|
|
|
|
|
|
|
# End of non-bug tests
|
|
|
|
|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
#
|
|
|
|
|
# Some "real" examples
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
# fac
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop table if exists fac|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create table fac (n int unsigned not null primary key, f bigint unsigned)|
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists ifac|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure ifac(n int unsigned)
|
|
|
|
|
begin
|
|
|
|
|
declare i int unsigned default 1;
|
|
|
|
|
|
|
|
|
|
if n > 20 then
|
|
|
|
|
set n = 20; # bigint overflow otherwise
|
|
|
|
|
end if;
|
|
|
|
|
while i <= n do
|
|
|
|
|
begin
|
|
|
|
|
insert into test.fac values (i, fac(i));
|
|
|
|
|
set i = i + 1;
|
|
|
|
|
end;
|
|
|
|
|
end while;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call ifac(20)|
|
|
|
|
|
select * from fac|
|
|
|
|
|
drop table fac|
|
|
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
|
|
|
show function status like '%f%'|
|
|
|
|
|
drop procedure ifac|
|
|
|
|
|
drop function fac|
|
|
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
|
|
|
show function status like '%f%'|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# primes
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop table if exists primes|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create table primes (
|
|
|
|
|
i int unsigned not null primary key,
|
|
|
|
|
p bigint unsigned not null
|
|
|
|
|
)|
|
|
|
|
|
|
|
|
|
|
insert into primes values
|
|
|
|
|
( 0, 3), ( 1, 5), ( 2, 7), ( 3, 11), ( 4, 13),
|
|
|
|
|
( 5, 17), ( 6, 19), ( 7, 23), ( 8, 29), ( 9, 31),
|
|
|
|
|
(10, 37), (11, 41), (12, 43), (13, 47), (14, 53),
|
|
|
|
|
(15, 59), (16, 61), (17, 67), (18, 71), (19, 73),
|
|
|
|
|
(20, 79), (21, 83), (22, 89), (23, 97), (24, 101),
|
|
|
|
|
(25, 103), (26, 107), (27, 109), (28, 113), (29, 127),
|
|
|
|
|
(30, 131), (31, 137), (32, 139), (33, 149), (34, 151),
|
|
|
|
|
(35, 157), (36, 163), (37, 167), (38, 173), (39, 179),
|
|
|
|
|
(40, 181), (41, 191), (42, 193), (43, 197), (44, 199)|
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists opp|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure opp(n bigint unsigned, out pp bool)
|
|
|
|
|
begin
|
|
|
|
|
declare r double;
|
|
|
|
|
declare b, s bigint unsigned default 0;
|
|
|
|
|
|
|
|
|
|
set r = sqrt(n);
|
|
|
|
|
|
|
|
|
|
again:
|
|
|
|
|
loop
|
|
|
|
|
if s = 45 then
|
|
|
|
|
set b = b+200, s = 0;
|
|
|
|
|
else
|
|
|
|
|
begin
|
|
|
|
|
declare p bigint unsigned;
|
|
|
|
|
|
|
|
|
|
select t.p into p from test.primes t where t.i = s;
|
|
|
|
|
if b+p > r then
|
|
|
|
|
set pp = 1;
|
|
|
|
|
leave again;
|
|
|
|
|
end if;
|
|
|
|
|
if mod(n, b+p) = 0 then
|
|
|
|
|
set pp = 0;
|
|
|
|
|
leave again;
|
|
|
|
|
end if;
|
|
|
|
|
set s = s+1;
|
|
|
|
|
end;
|
|
|
|
|
end if;
|
|
|
|
|
end loop;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists ip|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure ip(m int unsigned)
|
|
|
|
|
begin
|
|
|
|
|
declare p bigint unsigned;
|
|
|
|
|
declare i int unsigned;
|
|
|
|
|
|
|
|
|
|
set i=45, p=201;
|
|
|
|
|
|
|
|
|
|
while i < m do
|
|
|
|
|
begin
|
|
|
|
|
declare pp bool default 0;
|
|
|
|
|
|
|
|
|
|
call opp(p, pp);
|
|
|
|
|
if pp then
|
|
|
|
|
insert into test.primes values (i, p);
|
|
|
|
|
set i = i+1;
|
|
|
|
|
end if;
|
|
|
|
|
set p = p+2;
|
|
|
|
|
end;
|
|
|
|
|
end while;
|
|
|
|
|
end|
|
|
|
|
|
show create procedure opp|
|
|
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
|
|
|
show procedure status like '%p%'|
|
|
|
|
|
|
|
|
|
|
# This isn't the fastest way in the world to compute prime numbers, so
|
|
|
|
|
# don't be too ambitious. ;-)
|
|
|
|
|
call ip(200)|
|
|
|
|
|
# We don't want to select the entire table here, just pick a few
|
|
|
|
|
# examples.
|
|
|
|
|
# The expected result is:
|
|
|
|
|
# i p
|
|
|
|
|
# --- ----
|
|
|
|
|
# 45 211
|
|
|
|
|
# 100 557
|
|
|
|
|
# 199 1229
|
|
|
|
|
select * from primes where i=45 or i=100 or i=199|
|
|
|
|
|
drop table primes|
|
|
|
|
|
drop procedure opp|
|
|
|
|
|
drop procedure ip|
|
|
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
|
|
|
show procedure status like '%p%'|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Fibonacci, for recursion test. (Yet Another Numerical series :)
|
2005-07-01 11:01:46 +02:00
|
|
|
|
#
|
|
|
|
|
# This part of test is disabled until we implement support for
|
|
|
|
|
# recursive stored procedures.
|
2005-07-31 11:49:55 +02:00
|
|
|
|
--disable_parsing
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop table if exists fib|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create table fib ( f bigint unsigned not null )|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
|
2005-07-31 11:49:55 +02:00
|
|
|
|
# We deliberately do it the awkward way, fetching the last two
|
|
|
|
|
# values from the table, in order to exercise various statements
|
|
|
|
|
# and table accesses at each turn.
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists fib|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure fib(n int unsigned)
|
|
|
|
|
begin
|
|
|
|
|
if n > 1 then
|
|
|
|
|
begin
|
|
|
|
|
declare x, y bigint unsigned;
|
|
|
|
|
declare c cursor for select f from fib order by f desc limit 2;
|
|
|
|
|
|
|
|
|
|
open c;
|
|
|
|
|
fetch c into y;
|
|
|
|
|
fetch c into x;
|
|
|
|
|
close c;
|
|
|
|
|
insert into fib values (x+y);
|
|
|
|
|
call fib(n-1);
|
|
|
|
|
end;
|
|
|
|
|
end if;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
# Minimum test: recursion of 3 levels
|
|
|
|
|
|
|
|
|
|
insert into fib values (0), (1)|
|
|
|
|
|
|
|
|
|
|
call fib(3)|
|
|
|
|
|
|
|
|
|
|
select * from fib order by f asc|
|
|
|
|
|
|
|
|
|
|
delete from fib|
|
|
|
|
|
|
|
|
|
|
# Original test: 20 levels (may run into memory limits!)
|
|
|
|
|
|
|
|
|
|
insert into fib values (0), (1)|
|
|
|
|
|
|
|
|
|
|
call fib(20)|
|
|
|
|
|
|
|
|
|
|
select * from fib order by f asc|
|
|
|
|
|
drop table fib|
|
|
|
|
|
drop procedure fib|
|
|
|
|
|
--enable_parsing
|
2005-03-07 17:16:37 +01:00
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Comment & suid
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bar|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bar(x char(16), y int)
|
|
|
|
|
comment "111111111111" sql security invoker
|
|
|
|
|
insert into test.t1 values (x, y)|
|
|
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
|
|
|
show procedure status like 'bar'|
|
|
|
|
|
alter procedure bar comment "2222222222" sql security definer|
|
|
|
|
|
alter procedure bar comment "3333333333"|
|
|
|
|
|
alter procedure bar|
|
|
|
|
|
show create procedure bar|
|
|
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
|
|
|
show procedure status like 'bar'|
|
|
|
|
|
drop procedure bar|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# rexecution
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists p1|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure p1 ()
|
|
|
|
|
select (select s1 from t3) from t3|
|
|
|
|
|
|
|
|
|
|
create table t3 (s1 int)|
|
|
|
|
|
|
|
|
|
|
call p1()|
|
|
|
|
|
insert into t3 values (1)|
|
|
|
|
|
call p1()|
|
|
|
|
|
drop procedure p1|
|
|
|
|
|
drop table t3|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# backticks
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists foo|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function `foo` () returns int
|
|
|
|
|
return 5|
|
|
|
|
|
select `foo` ()|
|
|
|
|
|
drop function `foo`|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Implicit LOCK/UNLOCK TABLES for table access in functions
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
--disable_warning
|
|
|
|
|
drop function if exists t1max|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function t1max() returns int
|
|
|
|
|
begin
|
|
|
|
|
declare x int;
|
|
|
|
|
select max(data) into x from t1;
|
|
|
|
|
return x;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
insert into t1 values ("foo", 3), ("bar", 2), ("zip", 5), ("zap", 1)|
|
|
|
|
|
select t1max()|
|
|
|
|
|
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
|
|
|
|
|
begin
|
|
|
|
|
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;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
select * from t1 where data = getcount("bar")|
|
|
|
|
|
select * from t3|
|
|
|
|
|
select getcount("zip")|
|
|
|
|
|
select getcount("zip")|
|
|
|
|
|
select * from t3|
|
|
|
|
|
select getcount(id) from t1 where data = 3|
|
|
|
|
|
select getcount(id) from t1 where data = 5|
|
|
|
|
|
select * from t3|
|
|
|
|
|
drop table t3|
|
|
|
|
|
drop function getcount|
|
|
|
|
|
|
|
|
|
|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
#
|
|
|
|
|
# Test cases for old bugs
|
|
|
|
|
#
|
|
|
|
|
|
2003-10-10 16:57:21 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#822
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug822|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug822(a_id char(16), a_data int)
|
2003-10-03 12:39:12 +02:00
|
|
|
|
begin
|
|
|
|
|
declare n int;
|
|
|
|
|
select count(*) into n from t1 where id = a_id and data = a_data;
|
|
|
|
|
if n = 0 then
|
|
|
|
|
insert into t1 (id, data) values (a_id, a_data);
|
|
|
|
|
end if;
|
|
|
|
|
end|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
delete from t1|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug822('foo', 42)|
|
|
|
|
|
call bug822('foo', 42)|
|
|
|
|
|
call bug822('bar', 666)|
|
2003-10-03 12:39:12 +02:00
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
drop procedure bug822|
|
2003-10-03 12:39:12 +02:00
|
|
|
|
|
2003-10-14 12:59:28 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#1495
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug1495|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug1495()
|
2003-10-14 12:59:28 +02:00
|
|
|
|
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)|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug1495()|
|
2003-10-14 12:59:28 +02:00
|
|
|
|
delete from t1 where id='foo'|
|
|
|
|
|
insert into t1 values ('bar', 7)|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug1495()|
|
2003-10-14 12:59:28 +02:00
|
|
|
|
delete from t1 where id='bar'|
|
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
drop procedure bug1495|
|
2003-10-14 12:59:28 +02:00
|
|
|
|
|
2003-10-15 19:03:37 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#1547
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug1547|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug1547(s char(16))
|
2003-10-15 19:03:37 +02:00
|
|
|
|
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)|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug1547("foo")|
|
|
|
|
|
call bug1547("bar")|
|
2003-10-15 19:03:37 +02:00
|
|
|
|
select * from t1|
|
|
|
|
|
delete from t1|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
drop procedure bug1547|
|
2003-10-15 19:03:37 +02:00
|
|
|
|
|
2003-10-28 15:43:49 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#1656
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop table if exists t70|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create table t70 (s1 int,s2 int)|
|
|
|
|
|
insert into t70 values (1,2)|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug1656|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug1656(out p1 int, out p2 int)
|
2003-10-28 15:43:49 +01:00
|
|
|
|
select * into p1, p1 from t70|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug1656(@1, @2)|
|
2003-10-28 15:43:49 +01:00
|
|
|
|
select @1, @2|
|
|
|
|
|
drop table t70|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
drop procedure bug1656|
|
2003-10-28 15:43:49 +01:00
|
|
|
|
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#1862
|
|
|
|
|
#
|
|
|
|
|
create table t3(a int)|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug1862|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug1862()
|
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
|
|
|
|
|
insert into t3 values(2);
|
|
|
|
|
flush tables;
|
|
|
|
|
end|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug1862()|
|
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
|
|
|
|
# the second call caused a segmentation
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug1862()|
|
Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
mysql-test/r/sp-error.result:
Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
Corrected security syntax for alter/create procedure.
New tests for setting local variables to null,
bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
up in the wrong memroot).
Catch errors and warnings even if return values is 0 from sub-statements.
Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
Set old table pointers to NULL after sub-statement call (since all tables are
closed).
sql/sql_class.cc:
Corrected error message when no rows return by a SELECT INTO var; should
be a "no data" warning.
sql/sql_lex.h:
Have to store the original table_list first pointer for some
sub-statements in SPs.
sql/sql_yacc.yy:
Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
suffixes, and fixed valgrind complaints for SP COMMENTs.
(Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
|
|
|
|
select * from t3|
|
|
|
|
|
drop table t3|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
drop procedure bug1862|
|
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
|
|
|
|
|
2003-11-20 18:30:02 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#1874
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug1874|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug1874()
|
2003-11-20 18:30:02 +01:00
|
|
|
|
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)|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug1874()|
|
2003-11-20 18:30:02 +01:00
|
|
|
|
select * from t2|
|
|
|
|
|
delete from t1|
|
|
|
|
|
delete from t2|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
drop procedure bug1874|
|
2003-11-20 18:30:02 +01:00
|
|
|
|
|
2004-01-08 10:55:10 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#2260
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2260|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug2260()
|
2004-01-08 10:55:10 +01:00
|
|
|
|
begin
|
|
|
|
|
declare v1 int;
|
|
|
|
|
declare c1 cursor for select data from t1;
|
2004-03-29 11:16:45 +02:00
|
|
|
|
declare continue handler for not found set @x2 = 1;
|
2004-01-08 10:55:10 +01:00
|
|
|
|
|
|
|
|
|
open c1;
|
|
|
|
|
fetch c1 into v1;
|
|
|
|
|
set @x2 = 2;
|
|
|
|
|
close c1;
|
|
|
|
|
end|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug2260()|
|
2004-01-08 10:55:10 +01:00
|
|
|
|
select @x2|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
drop procedure bug2260|
|
2004-01-08 10:55:10 +01:00
|
|
|
|
|
2004-01-14 18:18:29 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#2267
|
|
|
|
|
#
|
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
|
|
|
|
# NOTE: This test case will be fixed as soon as Monty
|
|
|
|
|
# will allow to open mysql.proc table under LOCK TABLES
|
|
|
|
|
# without mentioning in lock list.
|
|
|
|
|
#
|
|
|
|
|
# FIXME: Other solution would be to use preopened proc table
|
|
|
|
|
# instead of opening it anew.
|
|
|
|
|
#
|
2005-07-31 11:49:55 +02:00
|
|
|
|
--disable_parsing
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2267_1|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug2267_1()
|
|
|
|
|
begin
|
|
|
|
|
show procedure status;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2267_2|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug2267_2()
|
|
|
|
|
begin
|
|
|
|
|
show function status;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2267_3|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug2267_3()
|
|
|
|
|
begin
|
|
|
|
|
show create procedure bug2267_1;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2267_4|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug2267_4()
|
|
|
|
|
begin
|
|
|
|
|
show create function fac;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
|
|
|
call bug2267_1()|
|
|
|
|
|
--replace_column 5 '0000-00-00 00:00:00' 6 '0000-00-00 00:00:00'
|
|
|
|
|
call bug2267_2()|
|
|
|
|
|
call bug2267_3()|
|
|
|
|
|
call bug2267_4()|
|
|
|
|
|
|
|
|
|
|
drop procedure bug2267_1|
|
|
|
|
|
drop procedure bug2267_2|
|
|
|
|
|
drop procedure bug2267_3|
|
|
|
|
|
drop procedure bug2267_4|
|
|
|
|
|
--enable_parsing
|
2004-01-14 18:18:29 +01:00
|
|
|
|
|
2004-01-21 14:28:35 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#2227
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2227|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug2227(x int)
|
2004-01-21 14:28:35 +01:00
|
|
|
|
begin
|
|
|
|
|
declare y float default 2.6;
|
|
|
|
|
declare z char(16) default "zzz";
|
|
|
|
|
|
|
|
|
|
select 1.3, x, y, 42, z;
|
|
|
|
|
end|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug2227(9)|
|
|
|
|
|
drop procedure bug2227|
|
2004-01-21 14:28:35 +01:00
|
|
|
|
|
2004-02-03 15:58:22 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#2614
|
|
|
|
|
#
|
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
|
|
|
|
# QQ The second insert doesn't work with temporary tables (it was an
|
|
|
|
|
# QQ ordinary table before we changed the locking scheme). It results
|
|
|
|
|
# QQ in an error: 1137: Can't reopen table: 't3'
|
|
|
|
|
# QQ which is a known limit with temporary tables.
|
|
|
|
|
# QQ For this reason we can't run this test any more (i.e., if we modify
|
|
|
|
|
# QQ it, it's no longer a test case for the bug), but we keep it here
|
|
|
|
|
# QQ anyway, for tracability.
|
2005-07-31 11:49:55 +02:00
|
|
|
|
--disable_parsing
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2614|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug2614()
|
|
|
|
|
begin
|
|
|
|
|
drop temporary table if exists t3;
|
|
|
|
|
create temporary table t3 (id int default '0' not null);
|
|
|
|
|
insert into t3 select 12;
|
|
|
|
|
insert into t3 select * from t3;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
call bug2614()|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
call bug2614()|
|
|
|
|
|
drop temporary table t3|
|
|
|
|
|
drop procedure bug2614|
|
|
|
|
|
--enable_parsing
|
2004-02-03 15:58:22 +01:00
|
|
|
|
|
2004-03-17 12:09:03 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#2674
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug2674|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function bug2674() returns int
|
2004-03-17 12:09:03 +01:00
|
|
|
|
return @@sort_buffer_size|
|
|
|
|
|
|
2004-03-29 11:16:45 +02:00
|
|
|
|
set @osbs = @@sort_buffer_size|
|
|
|
|
|
set @@sort_buffer_size = 262000|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
select bug2674()|
|
|
|
|
|
drop function bug2674|
|
2004-03-29 11:16:45 +02:00
|
|
|
|
set @@sort_buffer_size = @osbs|
|
2004-03-17 12:09:03 +01:00
|
|
|
|
|
2004-03-23 12:04:40 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#3259
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug3259_1 |
|
|
|
|
|
--enable_warnings
|
2004-03-23 12:04:40 +01:00
|
|
|
|
create procedure bug3259_1 () begin end|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists BUG3259_2 |
|
|
|
|
|
--enable_warnings
|
2004-03-23 12:04:40 +01:00
|
|
|
|
create procedure BUG3259_2 () begin end|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists Bug3259_3 |
|
|
|
|
|
--enable_warnings
|
2004-03-23 12:04:40 +01:00
|
|
|
|
create procedure Bug3259_3 () begin end|
|
|
|
|
|
|
|
|
|
|
call BUG3259_1()|
|
|
|
|
|
call BUG3259_1()|
|
|
|
|
|
call bug3259_2()|
|
|
|
|
|
call Bug3259_2()|
|
|
|
|
|
call bug3259_3()|
|
|
|
|
|
call bUG3259_3()|
|
|
|
|
|
|
|
|
|
|
drop procedure bUg3259_1|
|
|
|
|
|
drop procedure BuG3259_2|
|
|
|
|
|
drop procedure BUG3259_3|
|
|
|
|
|
|
2004-04-06 13:26:53 +02:00
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
# BUG#2772
|
2004-04-06 13:26:53 +02:00
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug2772|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function bug2772() returns char(10) character set latin2
|
2004-04-06 13:26:53 +02:00
|
|
|
|
return 'a'|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
select bug2772()|
|
|
|
|
|
drop function bug2772|
|
2004-04-06 13:26:53 +02:00
|
|
|
|
|
2004-04-06 15:48:58 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#2776
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2776_1|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug2776_1(out x int)
|
2004-04-06 15:48:58 +02:00
|
|
|
|
begin
|
|
|
|
|
declare v int;
|
|
|
|
|
|
|
|
|
|
set v = default;
|
|
|
|
|
set x = v;
|
|
|
|
|
end|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2776_2|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug2776_2(out x int)
|
2004-04-06 15:48:58 +02:00
|
|
|
|
begin
|
|
|
|
|
declare v int default 42;
|
|
|
|
|
|
|
|
|
|
set v = default;
|
|
|
|
|
set x = v;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
set @x = 1|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug2776_1(@x)|
|
2004-04-06 15:48:58 +02:00
|
|
|
|
select @x|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug2776_2(@x)|
|
2004-04-06 15:48:58 +02:00
|
|
|
|
select @x|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
drop procedure bug2776_1|
|
|
|
|
|
drop procedure bug2776_2|
|
2004-04-06 15:48:58 +02:00
|
|
|
|
|
2004-04-06 16:29:38 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#2780
|
|
|
|
|
#
|
|
|
|
|
create table t3 (s1 smallint)|
|
|
|
|
|
|
|
|
|
|
insert into t3 values (123456789012)|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2780|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug2780()
|
2004-04-06 16:29:38 +02:00
|
|
|
|
begin
|
|
|
|
|
declare exit handler for sqlwarning set @x = 1;
|
|
|
|
|
|
|
|
|
|
set @x = 0;
|
|
|
|
|
insert into t3 values (123456789012);
|
|
|
|
|
insert into t3 values (0);
|
|
|
|
|
end|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
call bug2780()|
|
2004-04-06 16:29:38 +02:00
|
|
|
|
select @x|
|
|
|
|
|
select * from t3|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
drop procedure bug2780|
|
2004-04-06 16:29:38 +02:00
|
|
|
|
drop table t3|
|
|
|
|
|
|
2004-05-28 18:33:14 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#1863
|
|
|
|
|
#
|
|
|
|
|
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)|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug1863|
|
|
|
|
|
--enable_warnings
|
2004-05-28 18:33:14 +02:00
|
|
|
|
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;
|
|
|
|
|
|
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 temporary table if exists temp_t1;
|
2004-05-28 18:33:14 +02:00
|
|
|
|
create temporary table temp_t1 (
|
|
|
|
|
f1 int auto_increment, f2 varchar(20), primary key (f1)
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
insert into temp_t1 (f2) select content from t3;
|
|
|
|
|
|
|
|
|
|
select f2 into t3 from temp_t1 where f1 = 10;
|
|
|
|
|
|
|
|
|
|
if (rc) then
|
|
|
|
|
insert into t4 values (1, rc, t3);
|
|
|
|
|
end if;
|
|
|
|
|
|
|
|
|
|
insert into t4 values (2, rc, t3);
|
|
|
|
|
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call bug1863(10)|
|
|
|
|
|
call bug1863(10)|
|
|
|
|
|
select * from t4|
|
|
|
|
|
|
|
|
|
|
drop procedure bug1863|
|
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 temporary table temp_t1;
|
2004-05-28 18:33:14 +02:00
|
|
|
|
drop table t3, t4|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#2656
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
create table t3 (
|
|
|
|
|
OrderID int not null,
|
|
|
|
|
MarketID int,
|
|
|
|
|
primary key (OrderID)
|
|
|
|
|
)|
|
|
|
|
|
|
|
|
|
|
create table t4 (
|
|
|
|
|
MarketID int not null,
|
|
|
|
|
Market varchar(60),
|
|
|
|
|
Status char(1),
|
|
|
|
|
primary key (MarketID)
|
|
|
|
|
)|
|
|
|
|
|
|
|
|
|
|
insert t3 (OrderID,MarketID) values (1,1)|
|
|
|
|
|
insert t3 (OrderID,MarketID) values (2,2)|
|
|
|
|
|
insert t4 (MarketID,Market,Status) values (1,"MarketID One","A")|
|
|
|
|
|
insert t4 (MarketID,Market,Status) values (2,"MarketID Two","A")|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2656_1|
|
|
|
|
|
--enable_warnings
|
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
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2656_2|
|
|
|
|
|
--enable_warnings
|
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()|
|
|
|
|
|
call bug2656_1()|
|
|
|
|
|
call bug2656_2()|
|
|
|
|
|
call bug2656_2()|
|
|
|
|
|
drop procedure bug2656_1|
|
|
|
|
|
drop procedure bug2656_2|
|
|
|
|
|
drop table t3, t4|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#3426
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug3426|
|
|
|
|
|
--enable_warnings
|
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|
|
|
|
|
|
call bug3426(NULL, @i)|
|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
|
# Clear SP cache
|
|
|
|
|
alter procedure bug3426 sql security invoker|
|
|
|
|
|
call bug3426(NULL, @i)|
|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
|
call bug3426(1000, @i)|
|
|
|
|
|
select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
|
|
|
|
|
|
|
|
|
|
drop procedure bug3426|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#3448
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
create table t3 (
|
|
|
|
|
a int primary key,
|
|
|
|
|
ach char(1)
|
|
|
|
|
) engine = innodb|
|
|
|
|
|
|
|
|
|
|
create table t4 (
|
|
|
|
|
b int primary key ,
|
|
|
|
|
bch char(1)
|
|
|
|
|
) engine = innodb|
|
2004-07-13 21:00:00 +02:00
|
|
|
|
--enable_warnings
|
2004-05-28 18:33:14 +02:00
|
|
|
|
|
|
|
|
|
insert into t3 values (1 , 'aCh1' ) , ('2' , 'aCh2')|
|
|
|
|
|
insert into t4 values (1 , 'bCh1' )|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug3448|
|
|
|
|
|
--enable_warnings
|
2004-05-28 18:33:14 +02:00
|
|
|
|
create procedure bug3448()
|
|
|
|
|
select * from t3 inner join t4 on t3.a = t4.b|
|
|
|
|
|
|
|
|
|
|
select * from t3 inner join t4 on t3.a = t4.b|
|
|
|
|
|
call bug3448()|
|
|
|
|
|
call bug3448()|
|
|
|
|
|
|
|
|
|
|
drop procedure bug3448|
|
|
|
|
|
drop table t3, t4|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#3734
|
|
|
|
|
#
|
|
|
|
|
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
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug3734 |
|
|
|
|
|
--enable_warnings
|
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')|
|
|
|
|
|
call bug3734('Security')|
|
|
|
|
|
|
|
|
|
|
drop procedure bug3734|
|
|
|
|
|
drop table t3|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#3863
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug3863|
|
|
|
|
|
--enable_warnings
|
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|
|
|
|
|
|
call bug3863()|
|
|
|
|
|
select @a|
|
|
|
|
|
|
|
|
|
|
drop procedure bug3863|
|
|
|
|
|
|
2004-05-28 19:43:06 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#2460
|
|
|
|
|
#
|
2004-09-09 05:59:26 +02:00
|
|
|
|
|
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
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2460_1|
|
|
|
|
|
--enable_warnings
|
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)|
|
|
|
|
|
call bug2460_1(2)|
|
|
|
|
|
insert into t3 values (1, 1, 'foo'), (2, 1, 'bar'), (3, 1, 'zip zap')|
|
|
|
|
|
call bug2460_1(2)|
|
|
|
|
|
call bug2460_1(2)|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2460_2|
|
|
|
|
|
--enable_warnings
|
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|
|
|
|
|
|
|
|
|
|
|
drop procedure bug2460_1|
|
|
|
|
|
drop procedure bug2460_2|
|
|
|
|
|
drop table t3|
|
|
|
|
|
|
2003-11-20 18:30:02 +01:00
|
|
|
|
|
2004-06-09 14:19:43 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#2564
|
|
|
|
|
#
|
|
|
|
|
set @@sql_mode = ''|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2564_1|
|
|
|
|
|
--enable_warnings
|
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
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2564_2|
|
|
|
|
|
--enable_warnings
|
2004-06-09 14:19:43 +02:00
|
|
|
|
create procedure bug2564_2()
|
|
|
|
|
insert into "t1" values ('foo', 1)|
|
|
|
|
|
|
|
|
|
|
delimiter $|
|
|
|
|
|
set @@sql_mode = ''$
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug2564_3$
|
|
|
|
|
--enable_warnings
|
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
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug2564_4$
|
|
|
|
|
--enable_warnings
|
2004-06-09 14:19:43 +02:00
|
|
|
|
create function bug2564_4(x int, y int) returns int
|
|
|
|
|
return x || y$
|
|
|
|
|
delimiter |$
|
|
|
|
|
|
|
|
|
|
set @@sql_mode = ''|
|
|
|
|
|
show create procedure bug2564_1|
|
|
|
|
|
show create procedure bug2564_2|
|
|
|
|
|
show create function bug2564_3|
|
|
|
|
|
show create function bug2564_4|
|
|
|
|
|
|
|
|
|
|
drop procedure bug2564_1|
|
|
|
|
|
drop procedure bug2564_2|
|
|
|
|
|
drop function bug2564_3|
|
|
|
|
|
drop function bug2564_4|
|
|
|
|
|
|
2004-06-10 17:07:53 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#3132
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug3132|
|
|
|
|
|
--enable_warnings
|
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')|
|
|
|
|
|
drop function bug3132|
|
|
|
|
|
|
2004-06-14 12:38:54 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#3843
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug3843|
|
|
|
|
|
--enable_warnings
|
2004-06-14 12:38:54 +02:00
|
|
|
|
create procedure bug3843()
|
|
|
|
|
analyze table t1|
|
|
|
|
|
|
|
|
|
|
# Testing for packets out of order
|
|
|
|
|
call bug3843()|
|
|
|
|
|
call bug3843()|
|
|
|
|
|
select 1+2|
|
|
|
|
|
|
|
|
|
|
drop procedure bug3843|
|
|
|
|
|
|
2004-06-15 14:26:19 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#3368
|
|
|
|
|
#
|
|
|
|
|
create table t3 ( s1 char(10) )|
|
|
|
|
|
insert into t3 values ('a'), ('b')|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug3368|
|
|
|
|
|
--enable_warnings
|
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')|
|
|
|
|
|
call bug3368('yz')|
|
|
|
|
|
drop procedure bug3368|
|
|
|
|
|
drop table t3|
|
|
|
|
|
|
2004-07-22 16:46:59 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#4579
|
|
|
|
|
#
|
2005-01-03 20:04:33 +01:00
|
|
|
|
create table t3 (f1 int, f2 int)|
|
|
|
|
|
insert into t3 values (1,1)|
|
2004-07-22 16:46:59 +02:00
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug4579_1|
|
|
|
|
|
--enable_warnings
|
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
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug4579_2|
|
|
|
|
|
--enable_warnings
|
2004-07-22 16:46:59 +02:00
|
|
|
|
create procedure bug4579_2 ()
|
|
|
|
|
begin
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call bug4579_1()|
|
|
|
|
|
call bug4579_1()|
|
|
|
|
|
call bug4579_1()|
|
|
|
|
|
|
|
|
|
|
drop procedure bug4579_1|
|
|
|
|
|
drop procedure bug4579_2|
|
|
|
|
|
drop table t3|
|
|
|
|
|
|
2005-03-04 22:14:35 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#2773: Function's data type ignored in stored procedures
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug2773|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create function bug2773() returns int return null|
|
|
|
|
|
create table t3 as select bug2773()|
|
|
|
|
|
show create table t3|
|
|
|
|
|
drop table t3|
|
|
|
|
|
drop function bug2773|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#3788: Stored procedure packet error
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug3788|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
create function bug3788() returns date return cast("2005-03-04" as date)|
|
|
|
|
|
select bug3788()|
|
|
|
|
|
drop function bug3788|
|
|
|
|
|
|
|
|
|
|
create function bug3788() returns binary(5) return 5|
|
|
|
|
|
select bug3788()|
|
|
|
|
|
drop function bug3788|
|
|
|
|
|
|
2004-06-09 14:19:43 +02:00
|
|
|
|
|
2004-07-23 19:52:06 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#4726
|
|
|
|
|
#
|
|
|
|
|
create table t3 (f1 int, f2 int, f3 int)|
|
|
|
|
|
insert into t3 values (1,1,1)|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug4726|
|
|
|
|
|
--enable_warnings
|
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-07-29 16:52:17 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#4318
|
|
|
|
|
#
|
2005-08-11 14:58:15 +02:00
|
|
|
|
|
2005-09-01 20:02:08 +02:00
|
|
|
|
--disable_parsing # Don't know if HANDLER commands can work with SPs, or at all..
|
2005-08-11 14:58:15 +02:00
|
|
|
|
create table t3 (s1 int)|
|
|
|
|
|
insert into t3 values (3), (4)|
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug4318|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug4318()
|
|
|
|
|
handler t3 read next|
|
|
|
|
|
|
|
|
|
|
handler t3 open|
|
|
|
|
|
# Expect no results, as tables are closed, but there shouldn't be any errors
|
|
|
|
|
call bug4318()|
|
|
|
|
|
call bug4318()|
|
|
|
|
|
handler t3 close|
|
|
|
|
|
|
|
|
|
|
drop procedure bug4318|
|
|
|
|
|
drop table t3|
|
|
|
|
|
--enable_parsing
|
2004-07-29 16:52:17 +02:00
|
|
|
|
|
2004-08-06 13:47:01 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#4902: Stored procedure with SHOW WARNINGS leads to packet error
|
|
|
|
|
#
|
|
|
|
|
# Added tests for most other show commands we could find too.
|
|
|
|
|
# (Skipping those already tested, and the ones depending on optional handlers.)
|
|
|
|
|
#
|
|
|
|
|
# Note: This will return a large number of results of different formats,
|
|
|
|
|
# which makes it impossible to filter with --replace_column.
|
|
|
|
|
# It's possible that some of these are not deterministic across
|
|
|
|
|
# platforms. If so, just remove the offending command.
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug4902|
|
|
|
|
|
--enable_warnings
|
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 grants for 'root'@'localhost';
|
|
|
|
|
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|
|
2005-07-31 11:49:55 +02:00
|
|
|
|
--disable_parsing
|
|
|
|
|
show binlog events;
|
|
|
|
|
show storage engines;
|
|
|
|
|
show master status;
|
|
|
|
|
show slave hosts;
|
|
|
|
|
show slave status;
|
|
|
|
|
--enable_parsing
|
2004-08-06 13:47:01 +02:00
|
|
|
|
|
|
|
|
|
call bug4902()|
|
|
|
|
|
call bug4902()|
|
|
|
|
|
|
|
|
|
|
drop procedure bug4902|
|
|
|
|
|
|
2004-08-13 18:02:52 +02:00
|
|
|
|
# We need separate SP for SHOW PROCESSLIST since we want use replace_column
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug4902_2|
|
|
|
|
|
--enable_warnings
|
2004-08-13 18:02:52 +02:00
|
|
|
|
create procedure bug4902_2()
|
|
|
|
|
begin
|
|
|
|
|
show processlist;
|
|
|
|
|
end|
|
2005-07-22 03:32:57 +02:00
|
|
|
|
--replace_column 1 # 6 # 3 localhost
|
2004-08-13 18:02:52 +02:00
|
|
|
|
call bug4902_2()|
|
2005-07-22 03:32:57 +02:00
|
|
|
|
--replace_column 1 # 6 # 3 localhost
|
2004-08-13 18:02:52 +02:00
|
|
|
|
call bug4902_2()|
|
|
|
|
|
drop procedure bug4902_2|
|
|
|
|
|
|
2004-08-06 15:21:28 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#4904
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug4904|
|
|
|
|
|
--enable_warnings
|
2004-08-06 15:21:28 +02:00
|
|
|
|
create procedure bug4904()
|
|
|
|
|
begin
|
|
|
|
|
declare continue handler for sqlstate 'HY000' begin end;
|
|
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
|
create table t2 as select * from t3;
|
2004-08-06 15:21:28 +02:00
|
|
|
|
end|
|
|
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
|
-- error 1146
|
2004-08-06 15:21:28 +02:00
|
|
|
|
call bug4904()|
|
|
|
|
|
|
|
|
|
|
drop procedure bug4904|
|
|
|
|
|
|
2004-10-20 03:04:37 +02:00
|
|
|
|
create table t3 (s1 char character set latin1, s2 char character set latin2)|
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug4904|
|
|
|
|
|
--enable_warnings
|
2004-10-20 03:04:37 +02:00
|
|
|
|
create procedure bug4904 ()
|
|
|
|
|
begin
|
|
|
|
|
declare continue handler for sqlstate 'HY000' begin end;
|
|
|
|
|
|
|
|
|
|
select s1 from t3 union select s2 from t3;
|
|
|
|
|
end|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
call bug4904()|
|
2004-09-29 18:55:05 +02:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure bug4904|
|
2004-09-29 18:55:05 +02:00
|
|
|
|
drop table t3|
|
|
|
|
|
|
2004-10-23 13:30:05 +02:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#336
|
2004-10-23 13:30:05 +02:00
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug336|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug336(out y int)
|
2004-10-23 13:30:05 +02:00
|
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
|
declare x int;
|
|
|
|
|
set x = (select sum(t.data) from test.t1 t);
|
|
|
|
|
set y = x;
|
2004-10-23 13:30:05 +02:00
|
|
|
|
end|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
insert into t1 values ("a", 2), ("b", 3)|
|
|
|
|
|
call bug336(@y)|
|
|
|
|
|
select @y|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure bug336|
|
2004-10-23 13:30:05 +02:00
|
|
|
|
|
2004-10-23 14:23:32 +02:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#3157
|
2004-10-23 14:23:32 +02:00
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug3157|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug3157()
|
2004-10-23 14:23:32 +02: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;
|
|
|
|
|
end if;
|
2004-10-23 14:23:32 +02:00
|
|
|
|
end|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
set @n = 0|
|
|
|
|
|
insert into t1 values ("a", 1)|
|
|
|
|
|
call bug3157()|
|
|
|
|
|
select @n|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure bug3157|
|
2004-10-23 14:23:32 +02:00
|
|
|
|
|
2005-02-16 16:06:41 +01:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#5251: mysql changes creation time of a procedure/function when altering
|
2005-02-16 16:06:41 +01:00
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug5251|
|
2005-02-16 16:06:41 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug5251()
|
2005-02-16 16:06:41 +01:00
|
|
|
|
begin
|
|
|
|
|
end|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
select created into @c1 from mysql.proc
|
|
|
|
|
where db='test' and name='bug5251'|
|
|
|
|
|
--sleep 2
|
|
|
|
|
alter procedure bug5251 comment 'foobar'|
|
|
|
|
|
select count(*) from mysql.proc
|
|
|
|
|
where db='test' and name='bug5251' and created = @c1|
|
|
|
|
|
|
|
|
|
|
drop procedure bug5251|
|
2005-02-16 16:06:41 +01:00
|
|
|
|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#5279: Stored procedure packets out of order if CHECKSUM TABLE
|
2005-02-18 17:39:32 +01:00
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug5251|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug5251()
|
|
|
|
|
checksum table t1|
|
|
|
|
|
|
|
|
|
|
call bug5251()|
|
|
|
|
|
call bug5251()|
|
|
|
|
|
drop procedure bug5251|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#5287: Stored procedure crash if leave outside loop
|
|
|
|
|
#
|
2005-02-18 17:39:32 +01:00
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug5287|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug5287(param1 int)
|
|
|
|
|
label1:
|
|
|
|
|
begin
|
|
|
|
|
declare c cursor for select 5;
|
2005-02-18 17:39:32 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
loop
|
|
|
|
|
if param1 >= 0 then
|
|
|
|
|
leave label1;
|
|
|
|
|
end if;
|
|
|
|
|
end loop;
|
|
|
|
|
end|
|
|
|
|
|
call bug5287(1)|
|
|
|
|
|
drop procedure bug5287|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#5307: Stored procedure allows statement after BEGIN ... END
|
2005-02-18 17:39:32 +01:00
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug5307|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug5307()
|
|
|
|
|
begin
|
|
|
|
|
end; set @x = 3|
|
|
|
|
|
|
|
|
|
|
call bug5307()|
|
|
|
|
|
select @x|
|
|
|
|
|
drop procedure bug5307|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
|
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#5258: Stored procedure modified date is 0000-00-00
|
|
|
|
|
# (This was a design flaw)
|
2005-02-18 17:39:32 +01:00
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug5258|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug5258()
|
|
|
|
|
begin
|
|
|
|
|
end|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
|
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug5258_aux|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug5258_aux()
|
2005-02-18 17:39:32 +01:00
|
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
|
declare c, m char(19);
|
2005-02-18 17:39:32 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
select created,modified into c,m from mysql.proc where name = 'bug5258';
|
|
|
|
|
if c = m then
|
|
|
|
|
select 'Ok';
|
|
|
|
|
else
|
|
|
|
|
select c, m;
|
|
|
|
|
end if;
|
2005-02-18 17:39:32 +01:00
|
|
|
|
end|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
call bug5258_aux()|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure bug5258|
|
|
|
|
|
drop procedure bug5258_aux|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
|
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#4487: Stored procedure connection aborted if uninitialized char
|
2005-02-18 17:39:32 +01:00
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop function if exists bug4487|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create function bug4487() returns char
|
|
|
|
|
begin
|
|
|
|
|
declare v char;
|
|
|
|
|
return v;
|
|
|
|
|
end|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
select bug4487()|
|
|
|
|
|
drop function bug4487|
|
2005-02-18 17:39:32 +01:00
|
|
|
|
|
|
|
|
|
|
2005-02-25 13:19:44 +01:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#4941: Stored procedure crash fetching null value into variable.
|
2005-02-25 13:19:44 +01:00
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug4941|
|
2005-02-25 13:19:44 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug4941|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug4941(out x int)
|
2005-02-25 13:19:44 +01:00
|
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
|
declare c cursor for select i from t2 limit 1;
|
|
|
|
|
open c;
|
|
|
|
|
fetch c into x;
|
|
|
|
|
close c;
|
2005-02-25 13:19:44 +01:00
|
|
|
|
end|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
insert into t2 values (null, null, null)|
|
|
|
|
|
set @x = 42|
|
|
|
|
|
call bug4941(@x)|
|
|
|
|
|
select @x|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure bug4941|
|
2005-02-25 13:19:44 +01:00
|
|
|
|
|
|
|
|
|
|
2005-02-25 17:56:45 +01:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#3583: query cache doesn't work for stored procedures
|
|
|
|
|
#
|
2005-02-25 17:56:45 +01:00
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug3583|
|
2005-02-25 17:56:45 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug3583|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug3583()
|
2005-02-25 17:56:45 +01:00
|
|
|
|
begin
|
2005-03-07 17:16:37 +01:00
|
|
|
|
declare c int;
|
2005-02-25 17:56:45 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
select * from t1;
|
|
|
|
|
select count(*) into c from t1;
|
|
|
|
|
select c;
|
2005-02-25 17:56:45 +01:00
|
|
|
|
end|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
insert into t1 values ("x", 3), ("y", 5)|
|
|
|
|
|
set @x = @@query_cache_size|
|
|
|
|
|
set global query_cache_size = 10*1024*1024|
|
2005-02-25 17:56:45 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
flush status|
|
|
|
|
|
flush query cache|
|
|
|
|
|
show status like 'Qcache_hits'|
|
|
|
|
|
call bug3583()|
|
|
|
|
|
show status like 'Qcache_hits'|
|
|
|
|
|
call bug3583()|
|
|
|
|
|
call bug3583()|
|
|
|
|
|
show status like 'Qcache_hits'|
|
2005-02-25 17:56:45 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
set global query_cache_size = @x|
|
|
|
|
|
flush status|
|
|
|
|
|
flush query cache|
|
2005-02-25 17:56:45 +01:00
|
|
|
|
delete from t1|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure bug3583|
|
2004-09-17 15:40:38 +02:00
|
|
|
|
|
2005-03-02 17:25:58 +01:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#4905: Stored procedure doesn't clear for "Rows affected"
|
|
|
|
|
#
|
2005-03-02 17:25:58 +01:00
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug4905|
|
2005-03-02 17:25:58 +01:00
|
|
|
|
--enable_warnings
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create table t3 (s1 int,primary key (s1))|
|
2005-03-02 17:25:58 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug4905|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug4905()
|
|
|
|
|
begin
|
|
|
|
|
declare v int;
|
|
|
|
|
declare continue handler for sqlstate '23000' set v = 5;
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
insert into t3 values (1);
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call bug4905()|
|
|
|
|
|
select row_count()|
|
|
|
|
|
call bug4905()|
|
|
|
|
|
select row_count()|
|
|
|
|
|
call bug4905()|
|
|
|
|
|
select row_count()|
|
|
|
|
|
select * from t3|
|
|
|
|
|
|
|
|
|
|
drop procedure bug4905|
|
|
|
|
|
drop table t3|
|
2003-03-03 15:03:19 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#6022: Stored procedure shutdown problem with self-calling function.
|
|
|
|
|
#
|
2005-08-11 14:58:15 +02:00
|
|
|
|
|
2005-09-01 20:02:08 +02:00
|
|
|
|
--disable_parsing # until we implement support for recursive stored functions.
|
2005-08-11 14:58:15 +02:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug6022|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug6022|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function bug6022(x int) returns int
|
|
|
|
|
begin
|
|
|
|
|
if x < 0 then
|
|
|
|
|
return 0;
|
|
|
|
|
else
|
|
|
|
|
return bug6022(x-1);
|
|
|
|
|
end if;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
select bug6022(5)|
|
|
|
|
|
drop function bug6022|
|
|
|
|
|
--enable_parsing
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#6029: Stored procedure specific handlers should have priority
|
|
|
|
|
#
|
2003-03-06 19:16:46 +01:00
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug6029|
|
2003-03-06 19:16:46 +01:00
|
|
|
|
--enable_warnings
|
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug6029|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug6029()
|
2003-03-06 19:16:46 +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';
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
insert into t3 values (1);
|
|
|
|
|
insert into t3 values (1,2);
|
2003-03-06 19:16:46 +01:00
|
|
|
|
end|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
|
|
|
|
|
create table t3 (s1 int, primary key (s1))|
|
|
|
|
|
insert into t3 values (1)|
|
|
|
|
|
call bug6029()|
|
|
|
|
|
delete from t3|
|
|
|
|
|
call bug6029()|
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure bug6029|
|
|
|
|
|
drop table t3|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#8540: Local variable overrides an alias
|
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug8540|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--enable_warnings
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug8540()
|
|
|
|
|
begin
|
|
|
|
|
declare x int default 1;
|
|
|
|
|
select x as y, x+0 as z;
|
|
|
|
|
end|
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
call bug8540()|
|
|
|
|
|
drop procedure bug8540|
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#6642: Stored procedure crash if expression with set function
|
|
|
|
|
#
|
|
|
|
|
create table t3 (s1 int)|
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug6642|
|
|
|
|
|
--enable_warnings
|
2003-03-06 19:16:46 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug6642()
|
|
|
|
|
select abs(count(s1)) from t3|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
call bug6642()|
|
|
|
|
|
call bug6642()|
|
|
|
|
|
drop procedure bug6642|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#7013: Stored procedure crash if group by ... with rollup
|
|
|
|
|
#
|
|
|
|
|
insert into t3 values (0),(1)|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug7013|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug7013()
|
|
|
|
|
select s1,count(s1) from t3 group by s1 with rollup|
|
|
|
|
|
call bug7013()|
|
|
|
|
|
call bug7013()|
|
|
|
|
|
drop procedure bug7013|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#7743: 'Lost connection to MySQL server during query' on Stored Procedure
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop table if exists t4|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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')|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug7743|
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
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-05 18:52:33 +01:00
|
|
|
|
end|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
call bug7743("oneword")|
|
|
|
|
|
call bug7743("OneWord")|
|
|
|
|
|
call bug7743("anotherword")|
|
|
|
|
|
call bug7743("AnotherWord")|
|
|
|
|
|
drop procedure bug7743|
|
|
|
|
|
drop table t4|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
|
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#7992: SELECT .. INTO variable .. within Stored Procedure crashes
|
|
|
|
|
# the server
|
2003-12-05 18:52:33 +01:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
delete from t3|
|
|
|
|
|
insert into t3 values(1)|
|
|
|
|
|
drop procedure if exists bug7992_1|
|
|
|
|
|
drop procedure if exists bug7992_2|
|
|
|
|
|
create procedure bug7992_1()
|
|
|
|
|
begin
|
|
|
|
|
declare i int;
|
|
|
|
|
select max(s1)+1 into i from t3;
|
|
|
|
|
end|
|
|
|
|
|
create procedure bug7992_2()
|
|
|
|
|
insert into t3 (s1) select max(t4.s1)+1 from t3 as t4|
|
2003-12-05 18:52:33 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
call bug7992_1()|
|
|
|
|
|
call bug7992_1()|
|
|
|
|
|
call bug7992_2()|
|
|
|
|
|
call bug7992_2()|
|
|
|
|
|
|
|
|
|
|
drop procedure bug7992_1|
|
|
|
|
|
drop procedure bug7992_2|
|
|
|
|
|
drop table t3|
|
2004-05-20 01:02:49 +02:00
|
|
|
|
|
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#8116: calling simple stored procedure twice in a row results
|
|
|
|
|
# in server crash
|
2004-05-20 01:02:49 +02:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create table t3 ( userid bigint(20) not null 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
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug8116|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug8116(in _userid int)
|
|
|
|
|
select * from t3 where userid = _userid|
|
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
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
call bug8116(42)|
|
|
|
|
|
call bug8116(42)|
|
|
|
|
|
drop procedure bug8116|
|
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 table t3|
|
2004-05-20 01:02:49 +02:00
|
|
|
|
|
2004-08-30 23:08:51 +02:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#6857: current_time() in STORED PROCEDURES
|
2004-08-30 23:08:51 +02:00
|
|
|
|
#
|
2004-12-28 16:58:14 +01:00
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug6857|
|
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
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
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;
|
|
|
|
|
end if;
|
|
|
|
|
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
|
|
|
|
# QQ: This is currently disabled. Not only does it slow down a normal test
|
|
|
|
|
# run, it makes running with valgrind (or similar tools) extremely
|
|
|
|
|
# painful.
|
|
|
|
|
# Make sure this takes at least one second on all machines in all builds.
|
|
|
|
|
# 30000 makes it about 3 seconds on an old 1.1GHz linux.
|
|
|
|
|
#call bug6857(300000)|
|
|
|
|
|
|
|
|
|
|
drop procedure bug6857|
|
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
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#8757: Stored Procedures: Scope of Begin and End Statements do not
|
|
|
|
|
# work properly.
|
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
|
|
|
|
--disable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
drop procedure if exists bug8757|
|
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
|
|
|
|
--enable_warnings
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create procedure bug8757()
|
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
|
|
|
|
|
declare x int;
|
2005-03-07 17:16:37 +01:00
|
|
|
|
declare c1 cursor for select data from t1 limit 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
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
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;
|
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
|
|
|
|
delete from t1|
|
|
|
|
|
delete from t2|
|
|
|
|
|
insert into t1 values ("x", 1)|
|
|
|
|
|
insert into t2 values ("y", 2, 0.0)|
|
|
|
|
|
|
|
|
|
|
call bug8757()|
|
|
|
|
|
|
|
|
|
|
delete from t1|
|
|
|
|
|
delete from t2|
|
|
|
|
|
drop procedure bug8757|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#8762: Stored Procedures: Inconsistent behavior
|
|
|
|
|
# of DROP PROCEDURE IF EXISTS statement.
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug8762|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
# Doesn't exist
|
|
|
|
|
drop procedure if exists bug8762; create procedure bug8762() begin end|
|
|
|
|
|
# Does exist
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#5240: Stored procedure crash if function has cursor declaration
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug5240|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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|
|
|
|
|
|
drop function bug5240|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#5278: Stored procedure packets out of order if SET PASSWORD.
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug5278|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function bug5278 () returns char
|
|
|
|
|
begin
|
|
|
|
|
SET PASSWORD FOR 'bob'@'%.loc.gov' = PASSWORD('newpass');
|
|
|
|
|
return 'okay';
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
--error 1133
|
|
|
|
|
select bug5278()|
|
|
|
|
|
--error 1133
|
|
|
|
|
select bug5278()|
|
|
|
|
|
drop function bug5278|
|
|
|
|
|
|
2005-01-20 16:04:24 +01:00
|
|
|
|
#
|
2005-02-09 15:02:37 +01:00
|
|
|
|
# BUG#7992: rolling back temporary Item tree changes in SP
|
2005-01-20 16:04:24 +01:00
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
2005-02-09 15:02:37 +01:00
|
|
|
|
drop procedure if exists p1|
|
2005-01-20 16:04:24 +01:00
|
|
|
|
--enable_warnings
|
2005-02-09 15:02:37 +01:00
|
|
|
|
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|
|
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
|
|
|
|
delimiter ;|
|
2005-02-09 15:02:37 +01:00
|
|
|
|
|
2005-03-03 15:38:59 +01:00
|
|
|
|
#
|
2005-03-07 17:16:37 +01:00
|
|
|
|
# BUG#8849: problem with insert statement with table alias's
|
|
|
|
|
#
|
|
|
|
|
# Rolling back changes to AND/OR structure of ON and WHERE clauses in SP
|
2005-03-03 15:38:59 +01:00
|
|
|
|
#
|
|
|
|
|
|
2005-03-08 23:09:18 +01:00
|
|
|
|
delimiter |;
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create table t3 (
|
|
|
|
|
lpitnumber int(11) default null,
|
|
|
|
|
lrecordtype int(11) default null
|
|
|
|
|
)|
|
2005-03-03 15:38:59 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
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)
|
|
|
|
|
)|
|
2005-03-03 15:38:59 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
create table t5 (
|
|
|
|
|
lbsiid int(11) not null default '0',
|
|
|
|
|
ltradingareaid int(11) not null default '0',
|
|
|
|
|
primary key (lbsiid,ltradingareaid)
|
|
|
|
|
)|
|
2005-03-03 15:38:59 +01:00
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug8849|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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;
|
2005-03-03 15:38:59 +01:00
|
|
|
|
end|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
call bug8849()|
|
|
|
|
|
call bug8849()|
|
|
|
|
|
call bug8849()|
|
|
|
|
|
drop procedure bug8849|
|
|
|
|
|
drop tables t3,t4,t5|
|
|
|
|
|
|
2005-03-07 18:09:53 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#8937: Stored Procedure: AVG() works as SUM() in SELECT ... INTO statement
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug8937|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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()|
|
|
|
|
|
|
|
|
|
|
drop procedure bug8937|
|
|
|
|
|
delete from t1|
|
|
|
|
|
|
2005-03-07 17:16:37 +01:00
|
|
|
|
|
2005-04-08 17:31:37 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#6900: Stored procedure inner handler ignored
|
|
|
|
|
# BUG#9074: STORED PROC: The scope of every handler declared is not
|
|
|
|
|
# properly applied
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug6900|
|
|
|
|
|
drop procedure if exists bug9074|
|
|
|
|
|
drop procedure if exists bug6900_9074|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
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()|
|
|
|
|
|
call bug9074()|
|
|
|
|
|
call bug6900_9074(0)|
|
|
|
|
|
call bug6900_9074(1)|
|
|
|
|
|
|
|
|
|
|
drop procedure bug6900|
|
|
|
|
|
drop procedure bug9074|
|
|
|
|
|
drop procedure bug6900_9074|
|
|
|
|
|
drop table t3|
|
|
|
|
|
|
|
|
|
|
|
2005-04-12 15:43:24 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#7185: Stored procedure crash if identifier is AVG
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists avg|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure avg ()
|
|
|
|
|
begin
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
call avg ()|
|
|
|
|
|
drop procedure avg|
|
|
|
|
|
|
|
|
|
|
|
2005-04-13 16:09:28 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#6129: Stored procedure won't display @@sql_mode value
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug6129|
|
|
|
|
|
--enable_warnings
|
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()|
|
|
|
|
|
set @@sql_mode= "NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO"|
|
|
|
|
|
call bug6129()|
|
|
|
|
|
set @@sql_mode= "NO_ZERO_IN_DATE"|
|
|
|
|
|
call bug6129()|
|
|
|
|
|
set @@sql_mode=@old_mode;
|
2005-04-13 16:09:28 +02:00
|
|
|
|
|
|
|
|
|
drop procedure bug6129|
|
|
|
|
|
|
|
|
|
|
|
2005-04-13 16:57:49 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#9856: Stored procedures: crash if handler for sqlexception, not found
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug9856|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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()|
|
|
|
|
|
call bug9856()|
|
|
|
|
|
drop procedure bug9856|
|
|
|
|
|
|
|
|
|
|
|
2005-04-13 17:43:53 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG##9674: Stored Procs: Using declared vars in algebric operation causes
|
|
|
|
|
# system crash.
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug9674_1|
|
|
|
|
|
drop procedure if exists bug9674_2|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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|
|
|
|
|
|
call bug9674_2()|
|
|
|
|
|
call bug9674_2()|
|
|
|
|
|
drop procedure bug9674_1|
|
|
|
|
|
drop procedure bug9674_2|
|
|
|
|
|
|
|
|
|
|
|
2005-04-14 14:52:35 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#9598: stored procedure call within stored procedure overwrites IN variable
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug9598_1|
|
|
|
|
|
drop procedure if exists bug9598_2|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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)|
|
|
|
|
|
select @tmp1, @tmp2|
|
|
|
|
|
|
|
|
|
|
drop procedure bug9598_1|
|
|
|
|
|
drop procedure bug9598_2|
|
|
|
|
|
|
|
|
|
|
|
2005-04-15 11:06:25 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#9902: Crash with simple stored function using user defined variables
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug9902|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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|
|
|
|
|
|
select bug9902() from t1|
|
|
|
|
|
select @x|
|
|
|
|
|
|
|
|
|
|
set global query_cache_size = @qcs1|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop function bug9902|
|
|
|
|
|
|
|
|
|
|
|
2005-04-19 10:09:25 +02:00
|
|
|
|
#
|
2005-04-19 11:51:11 +02:00
|
|
|
|
# BUG#9102: Stored proccedures: function which returns blob causes crash
|
2005-04-19 10:09:25 +02:00
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug9102|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function bug9102() returns blob return 'a'|
|
2005-04-19 11:51:11 +02:00
|
|
|
|
select bug9102()|
|
2005-04-19 10:09:25 +02:00
|
|
|
|
drop function bug9102|
|
2005-04-15 11:06:25 +02:00
|
|
|
|
|
2005-04-19 11:51:11 +02:00
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#7648: Stored procedure crash when invoking a function that returns a bit
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
2005-04-20 19:08:42 +02:00
|
|
|
|
drop function if exists bug7648|
|
2005-04-19 11:51:11 +02:00
|
|
|
|
--enable_warnings
|
|
|
|
|
create function bug7648() returns bit(8) return 'a'|
|
|
|
|
|
select bug7648()|
|
|
|
|
|
drop function bug7648|
|
|
|
|
|
|
|
|
|
|
|
2005-04-20 19:08:42 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#9775: crash if create function that returns enum or set
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug9775|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function bug9775(v1 char(1)) returns enum('a','b') return v1|
|
|
|
|
|
select bug9775('a'),bug9775('b'),bug9775('c')|
|
|
|
|
|
drop function bug9775|
|
|
|
|
|
create function bug9775(v1 int) returns enum('a','b') return v1|
|
|
|
|
|
select bug9775(1),bug9775(2),bug9775(3)|
|
|
|
|
|
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')|
|
|
|
|
|
drop function bug9775|
|
|
|
|
|
create function bug9775(v1 int) returns set('a','b') return v1|
|
|
|
|
|
select bug9775(1),bug9775(2),bug9775(3),bug9775(4)|
|
|
|
|
|
drop function bug9775|
|
|
|
|
|
|
|
|
|
|
|
2005-04-21 14:22:47 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#8861: If Return is a YEAR data type, value is not shown in year format
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug8861|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function bug8861(v1 int) returns year return v1|
|
|
|
|
|
select bug8861(05)|
|
|
|
|
|
set @x = bug8861(05)|
|
|
|
|
|
select @x|
|
|
|
|
|
drop function bug8861|
|
|
|
|
|
|
|
|
|
|
|
2005-04-22 12:53:48 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#9004: Inconsistent behaviour of SP re. warnings
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug9004_1|
|
|
|
|
|
drop procedure if exists bug9004_2|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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)|
|
|
|
|
|
|
|
|
|
|
# Truncation warnings expected...
|
|
|
|
|
call bug9004_1('12345678901234567')|
|
|
|
|
|
call bug9004_2('12345678901234567890')|
|
|
|
|
|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure bug9004_1|
|
|
|
|
|
drop procedure bug9004_2|
|
|
|
|
|
|
2005-04-28 23:46:54 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#7293: Stored procedure crash with soundex
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug7293|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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')|
|
|
|
|
|
call bug7293 ('secrete')|
|
|
|
|
|
drop procedure bug7293|
|
|
|
|
|
delete from t1|
|
2005-04-22 12:53:48 +02:00
|
|
|
|
|
2005-05-05 17:49:15 +02:00
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# BUG#9841: Unexpected read lock when trying to update a view in a
|
|
|
|
|
# stored procedure
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug9841|
|
|
|
|
|
drop view if exists v1|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
#
|
|
|
|
|
# BUG#5963 subqueries in SET/IF
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug5963|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
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()|
|
|
|
|
|
call bug5963_1()|
|
|
|
|
|
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-06-01 12:18:41 +02:00
|
|
|
|
|
2005-05-27 14:48:33 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#9559: Functions: Numeric Operations using -ve value gives incorrect
|
|
|
|
|
# results.
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug9559|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function bug9559()
|
|
|
|
|
returns int
|
|
|
|
|
begin
|
|
|
|
|
set @y = -6/2;
|
|
|
|
|
return @y;
|
|
|
|
|
end|
|
|
|
|
|
|
|
|
|
|
select bug9559()|
|
|
|
|
|
|
|
|
|
|
drop function bug9559|
|
|
|
|
|
|
|
|
|
|
|
2005-06-01 12:18:41 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#10961: Stored procedures: crash if select * from dual
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug10961|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
# "select * from dual" results in an error, so the cursor will not open
|
|
|
|
|
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()|
|
|
|
|
|
call bug10961()|
|
|
|
|
|
|
|
|
|
|
drop procedure bug10961|
|
|
|
|
|
|
2005-06-06 15:05:11 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG #6866: Second call of a stored procedure using a view with on expressions
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
DROP PROCEDURE IF EXISTS bug6866|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
DROP VIEW IF EXISTS tv|
|
|
|
|
|
DROP TABLE IF EXISTS tt1,tt2,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)|
|
|
|
|
|
CALL bug6866(1)|
|
|
|
|
|
CALL bug6866(1)|
|
|
|
|
|
|
|
|
|
|
DROP PROCEDURE bug6866;
|
|
|
|
|
|
|
|
|
|
DROP VIEW tv|
|
|
|
|
|
DROP TABLE tt1, tt2, tt3|
|
2005-06-01 12:18:41 +02:00
|
|
|
|
|
2005-06-21 23:17:08 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#10136: items cleunup
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
DROP PROCEDURE IF EXISTS bug10136|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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()|
|
|
|
|
|
call bug10136()|
|
|
|
|
|
call bug10136()|
|
|
|
|
|
drop procedure bug10136|
|
|
|
|
|
drop table t3|
|
|
|
|
|
|
2005-06-30 18:07:06 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#11529: crash server after use stored procedure
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug11529|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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
|
|
|
|
#
|
|
|
|
|
# BUG#6063: Stored procedure labels are subject to restrictions (partial)
|
|
|
|
|
# BUG#7088: Stored procedures: labels won't work if character set is utf8
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug6063|
|
|
|
|
|
drop procedure if exists bug7088_1|
|
|
|
|
|
drop procedure if exists bug7088_2|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
2005-09-01 20:02:08 +02:00
|
|
|
|
--disable_parsing # temporarily disabled until Bar fixes BUG#11986
|
2005-08-11 14:58:15 +02:00
|
|
|
|
create procedure bug6063()
|
|
|
|
|
l<>bel: begin end|
|
|
|
|
|
call bug6063()|
|
|
|
|
|
# QQ Known bug: this will not show the label correctly.
|
|
|
|
|
show create procedure bug6063|
|
|
|
|
|
|
|
|
|
|
set character set utf8|
|
|
|
|
|
create procedure bug7088_1()
|
|
|
|
|
label1: begin end label1|
|
|
|
|
|
create procedure bug7088_2()
|
|
|
|
|
läbel1: begin end|
|
|
|
|
|
call bug7088_1()|
|
|
|
|
|
call bug7088_2()|
|
|
|
|
|
set character set default|
|
|
|
|
|
show create procedure bug7088_1|
|
|
|
|
|
show create procedure bug7088_2|
|
|
|
|
|
|
|
|
|
|
drop procedure bug6063|
|
|
|
|
|
drop procedure bug7088_1|
|
|
|
|
|
drop procedure bug7088_2|
|
|
|
|
|
--enable_parsing
|
2005-07-06 16:37:57 +02:00
|
|
|
|
|
2005-07-15 11:34:48 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#9565: "Wrong locking in stored procedure if a sub-sequent procedure
|
|
|
|
|
# is called".
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug9565_sub|
|
|
|
|
|
drop procedure if exists bug9565|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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()|
|
|
|
|
|
delete from t1|
|
|
|
|
|
drop procedure bug9565_sub|
|
|
|
|
|
drop procedure bug9565|
|
|
|
|
|
|
2005-07-06 16:37:57 +02:00
|
|
|
|
|
2005-07-15 17:24:19 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#9538: SProc: Creation fails if we try to SET system variable
|
|
|
|
|
# using @@var_name in proc
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug9538|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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|
|
|
|
|
|
call bug9538()|
|
|
|
|
|
select @@sort_buffer_size|
|
|
|
|
|
set @@sort_buffer_size = @x|
|
|
|
|
|
|
|
|
|
|
drop procedure bug9538|
|
|
|
|
|
|
|
|
|
|
|
2005-07-22 08:11:23 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#8692: Cursor fetch of empty string
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug8692|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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)|
|
|
|
|
|
|
|
|
|
|
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()|
|
|
|
|
|
drop procedure bug8692|
|
|
|
|
|
drop table t3|
|
|
|
|
|
|
2005-08-08 15:46:06 +02:00
|
|
|
|
#
|
|
|
|
|
# Bug#10055 "Using stored function with information_schema causes empty
|
|
|
|
|
# result set"
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug10055|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create function bug10055(v char(255)) returns char(255) return lower(v)|
|
|
|
|
|
# This select should not crash server and should return all fields in t1
|
|
|
|
|
select t.column_name, bug10055(t.column_name)
|
|
|
|
|
from information_schema.columns as t
|
|
|
|
|
where t.table_schema = 'test' and t.table_name = 't1'|
|
|
|
|
|
drop function bug10055|
|
|
|
|
|
|
2005-08-18 11:23:54 +02:00
|
|
|
|
#
|
|
|
|
|
# Bug #12297 "SP crashes the server if data inserted inside a lon loop"
|
|
|
|
|
# The test for memleak bug, so actually there is no way to test it
|
|
|
|
|
# from the suite. The test below could be used to check SP memory
|
|
|
|
|
# consumption by passing large input parameter.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
2005-09-07 17:39:47 +02:00
|
|
|
|
drop procedure if exists bug12297|
|
2005-08-18 11:23:54 +02:00
|
|
|
|
--enable_warnings
|
|
|
|
|
|
2005-09-07 17:39:47 +02:00
|
|
|
|
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|
|
2005-08-18 11:23:54 +02:00
|
|
|
|
|
2005-09-07 17:39:47 +02:00
|
|
|
|
call bug12297(10)|
|
|
|
|
|
drop procedure bug12297|
|
2005-08-18 11:23:54 +02:00
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Bug #11247 "Stored procedures: Function calls in long loops leak memory"
|
|
|
|
|
# One more memleak bug test. One could use this test to check that the memory
|
|
|
|
|
# isn't leaking by increasing the input value for p_bug11247.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists f_bug11247|
|
|
|
|
|
drop procedure if exists p_bug11247|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
#
|
|
|
|
|
# BUG#12168: "'DECLARE CONTINUE HANDLER FOR NOT FOUND ...' in conditional
|
|
|
|
|
# handled incorrectly"
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug12168|
|
2005-08-24 10:25:57 +02:00
|
|
|
|
drop table if exists t3, t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
|
--enable_warnings
|
|
|
|
|
|
2005-08-24 10:25:57 +02:00
|
|
|
|
create table t3 (a int)|
|
|
|
|
|
insert into t3 values (1),(2),(3),(4)|
|
2005-08-19 15:03:21 +02:00
|
|
|
|
|
2005-08-24 10:25:57 +02:00
|
|
|
|
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|
|
|
|
|
|
truncate t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
|
call bug12168('b')|
|
2005-08-24 10:25:57 +02:00
|
|
|
|
select * from t4|
|
|
|
|
|
truncate t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
|
call bug12168('a')|
|
2005-08-24 10:25:57 +02:00
|
|
|
|
select * from t4|
|
|
|
|
|
truncate t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
|
call bug12168('b')|
|
2005-08-24 10:25:57 +02:00
|
|
|
|
select * from t4|
|
|
|
|
|
truncate t4|
|
|
|
|
|
drop table t3, t4|
|
2005-08-19 15:03:21 +02:00
|
|
|
|
drop procedure if exists bug12168|
|
2005-08-18 11:23:54 +02:00
|
|
|
|
|
2005-08-25 13:34:14 +02:00
|
|
|
|
#
|
|
|
|
|
# Bug #11333 "Stored Procedure: Memory blow up on repeated SELECT ... INTO
|
|
|
|
|
# query"
|
|
|
|
|
# One more memleak bug. Use the test to check memory consumption.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop table if exists t3|
|
|
|
|
|
drop procedure if exists bug11333|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
#
|
|
|
|
|
# BUG#9048: Creating a function with char binary IN parameter fails
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop function if exists bug9048|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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
|
|
|
|
#
|
|
|
|
|
# Bug #12849 Stored Procedure: Crash on procedure call with CHAR type
|
|
|
|
|
# 'INOUT' parameter
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug12849_1|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug12849_1(inout x char) select x into x|
|
|
|
|
|
set @var='a'|
|
|
|
|
|
call bug12849_1(@var)|
|
|
|
|
|
select @var|
|
|
|
|
|
drop procedure bug12849_1|
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug12849_2|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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|
|
|
|
|
|
drop procedure bug12849_2|
|
|
|
|
|
|
2005-09-13 12:50:21 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#13133: Local variables in stored procedures are not initialized correctly.
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug131333|
|
|
|
|
|
drop function if exists bug131333|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
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()|
|
|
|
|
|
select bug131333()|
|
|
|
|
|
|
|
|
|
|
drop procedure bug131333|
|
|
|
|
|
drop function bug131333|
|
|
|
|
|
|
2005-09-13 15:32:42 +02:00
|
|
|
|
#
|
|
|
|
|
# BUG#12379: PROCEDURE with HANDLER calling FUNCTION with error get
|
|
|
|
|
# strange result
|
|
|
|
|
#
|
|
|
|
|
--disable_warnings
|
|
|
|
|
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|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
|
|
|
|
|
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|
|
|
|
|
|
|
|
|
|
|
--error 1062
|
|
|
|
|
select bug12379()|
|
|
|
|
|
select 1|
|
|
|
|
|
call bug12379_1()|
|
|
|
|
|
select 2|
|
|
|
|
|
call bug12379_2()|
|
|
|
|
|
select 3|
|
|
|
|
|
--error 1062
|
|
|
|
|
call bug12379_3()|
|
|
|
|
|
select 4|
|
|
|
|
|
|
|
|
|
|
drop function bug12379|
|
|
|
|
|
drop procedure bug12379_1|
|
|
|
|
|
drop procedure bug12379_2|
|
|
|
|
|
drop procedure bug12379_3|
|
|
|
|
|
|
2005-09-13 17:59:26 +02:00
|
|
|
|
#
|
|
|
|
|
# Bug #13124 Stored Procedure using SELECT INTO crashes server
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
--disable_warnings
|
|
|
|
|
drop procedure if exists bug13124|
|
|
|
|
|
--enable_warnings
|
|
|
|
|
create procedure bug13124()
|
|
|
|
|
begin
|
|
|
|
|
declare y integer;
|
|
|
|
|
set @x=y;
|
|
|
|
|
end|
|
|
|
|
|
call bug13124()|
|
|
|
|
|
drop procedure bug13124|
|
|
|
|
|
|
2005-03-18 14:33:46 +01:00
|
|
|
|
#
|
|
|
|
|
# BUG#NNNN: New bug synopsis
|
|
|
|
|
#
|
|
|
|
|
#--disable_warnings
|
|
|
|
|
#drop procedure if exists bugNNNN|
|
|
|
|
|
#--enable_warnings
|
|
|
|
|
#create procedure bugNNNN...
|
|
|
|
|
|
2005-03-07 18:09:53 +01:00
|
|
|
|
# Add bugs above this line. Use existing tables t1 and t2 when
|
2005-06-30 18:07:06 +02:00
|
|
|
|
# practical, or create table t3, t4 etc temporarily (and drop them).
|
2005-03-07 17:16:37 +01:00
|
|
|
|
delimiter ;|
|
|
|
|
|
drop table t1,t2;
|