mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
f5a47f156b
FOUND is not a reserved keyword anymore Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete BUILD/SETUP.sh: Portability fix client/mysqltest.c: Portability fix mysql-test/r/drop.result: updated results mysql-test/r/func_str.result: New warnings (after merge) mysql-test/r/insert.result: Updated tests mysql-test/r/join_nested.result: Updated results (because of new column types in 5.0) mysql-test/r/lock_multi.result: Temporarly wrong results until Sanja fixes multi-update-lock in 5.0 mysql-test/r/multi_update.result: Temporary fix until Sanja fixes multi-update locking mysql-test/r/ps_1general.result: Update of results after merge mysql-test/r/ps_2myisam.result: Update of results after merge mysql-test/r/ps_3innodb.result: Update of results after merge mysql-test/r/ps_4heap.result: Update of results after merge mysql-test/r/ps_5merge.result: Update of results after merge mysql-test/r/ps_6bdb.result: Update of results after merge mysql-test/r/query_cache.result: Update of results after merge mysql-test/r/range.result: New results for new tests mysql-test/r/rpl_auto_increment.result: Update with new 4.0 information mysql-test/r/rpl_charset.result: After merge fixes mysql-test/r/subselect.result: After merge fixes mysql-test/r/view.result: Temporary fix until multi-update-locking is fixed mysql-test/t/drop.test: Safety fix mysql-test/t/multi_update.test: Temporary fix until multi-update-locking is fixed mysql-test/t/rpl_charset.test: More comments mysql-test/t/sp-error.test: Updated comments mysql-test/t/view.test: Temporary fix until multi-update-locking is fixed scripts/mysql_fix_privilege_tables.sh: Better error message sql-common/client.c: More debugging sql/ha_ndbcluster.cc: After merge fixes sql/handler.cc: After merge fixes sql/item.cc: Simple optimization of creating item After merge fixed Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted The problem is that if you compare a string field to a binary string, you can't replace the field with a string constant as the binary comparison may then fail (The original field value may be in a different case) sql/item.h: Added Item::set_no_const_sub() to be able to mark fields that can't be substituted sql/item_cmpfunc.cc: Mark fields compared as binary to not be substituted. sql/item_func.cc: After merge fix sql/log_event.cc: After merge fix sql/mysql_priv.h: After merge fix sql/opt_range.cc: After merge fix sql/protocol.cc: Made flags uint instead of int (as it's used as a bit mask) sql/protocol.h: Made flags uint instead of int (as it's used as a bit mask) sql/protocol_cursor.cc: Made flags uint instead of int (as it's used as a bit mask) Indentation cleanups sql/sp.cc: After merge fixes Removed compiler warnings sql/sp_head.cc: After merge fixes sql/sql_base.cc: After merge fixes Removed 'send_error' from 'insert_fields()' as the error is sent higher up sql/sql_class.cc: Give assert if set_n_backup_item_arena is used twice sql/sql_class.h: Give assert if set_n_backup_item_arena is used twice After merge fixes Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT sql/sql_handler.cc: After merge fixes sql/sql_parse.cc: After merge fixes sql/sql_prepare.cc: After merge fixes sql/sql_select.cc: After merge fixes Moved 'build_equal_items' to optimize_cond() (logical place) sql/sql_table.cc: After merge fixes sql/sql_trigger.cc: After merge fixes sql/sql_update.cc: After merge fixes (This should be fixed by Sanja to have lower granuality locking of tables in multi-update) sql/sql_view.cc: After merge fixes sql/sql_yacc.yy: After merge fixes Don't have FOUND as a reserved keyword
638 lines
9.8 KiB
Text
638 lines
9.8 KiB
Text
#
|
|
# Stored PROCEDURE error tests
|
|
#
|
|
|
|
# Make sure we don't have any procedures left.
|
|
delete from mysql.proc;
|
|
|
|
delimiter |;
|
|
|
|
# This should give three syntax errors (sometimes crashed; bug #643)
|
|
# (Unfortunately, this is not a 100% test, on some platforms this
|
|
# passed despite the bug.)
|
|
--error 1064
|
|
create procedure syntaxerror(t int)|
|
|
--error 1064
|
|
create procedure syntaxerror(t int)|
|
|
--error 1064
|
|
create procedure syntaxerror(t int)|
|
|
|
|
# Check that we get the right error, i.e. UDF declaration parses correctly,
|
|
# but foo.so doesn't exist.
|
|
# This generates an error message containing a misleading errno which
|
|
# might vary between systems (it usually doesn't have anything to do with
|
|
# the actual failing dlopen()).
|
|
#--error 1126
|
|
#create function foo returns real soname "foo.so"|
|
|
|
|
|
|
--disable_warnings
|
|
drop table if exists t3|
|
|
--enable_warnings
|
|
create table t3 ( x int )|
|
|
insert into t3 values (2), (3)|
|
|
|
|
create procedure bad_into(out param int)
|
|
select x from t3 into param|
|
|
|
|
--error 1172
|
|
call bad_into(@x)|
|
|
|
|
drop procedure bad_into|
|
|
drop table t3|
|
|
|
|
|
|
create procedure proc1()
|
|
set @x = 42|
|
|
|
|
create function func1() returns int
|
|
return 42|
|
|
|
|
# Can't create recursively
|
|
--error 1303
|
|
create procedure foo()
|
|
create procedure bar() set @x=3|
|
|
--error 1303
|
|
create procedure foo()
|
|
create function bar() returns double return 2.3|
|
|
|
|
# Already exists
|
|
--error 1304
|
|
create procedure proc1()
|
|
set @x = 42|
|
|
--error 1304
|
|
create function func1() returns int
|
|
return 42|
|
|
|
|
drop procedure proc1|
|
|
drop function func1|
|
|
|
|
# Does not exist
|
|
--error 1305
|
|
alter procedure foo|
|
|
--error 1305
|
|
alter function foo|
|
|
--error 1305
|
|
drop procedure foo|
|
|
--error 1305
|
|
drop function foo|
|
|
--error 1305
|
|
call foo()|
|
|
drop procedure if exists foo|
|
|
--error 1305
|
|
show create procedure foo|
|
|
|
|
# LEAVE/ITERATE/GOTO with no match
|
|
--error 1308
|
|
create procedure foo()
|
|
foo: loop
|
|
leave bar;
|
|
end loop|
|
|
--error 1308
|
|
create procedure foo()
|
|
foo: loop
|
|
iterate bar;
|
|
end loop|
|
|
--error 1308
|
|
create procedure foo()
|
|
foo: begin
|
|
iterate foo;
|
|
end|
|
|
--error 1308
|
|
create procedure foo()
|
|
begin
|
|
goto foo;
|
|
end|
|
|
--error 1308
|
|
create procedure foo()
|
|
begin
|
|
begin
|
|
label foo;
|
|
end;
|
|
goto foo;
|
|
end|
|
|
--error 1308
|
|
create procedure foo()
|
|
begin
|
|
goto foo;
|
|
begin
|
|
label foo;
|
|
end;
|
|
end|
|
|
--error 1308
|
|
create procedure foo()
|
|
begin
|
|
begin
|
|
goto foo;
|
|
end;
|
|
begin
|
|
label foo;
|
|
end;
|
|
end|
|
|
--error 1308
|
|
create procedure foo()
|
|
begin
|
|
begin
|
|
label foo;
|
|
end;
|
|
begin
|
|
goto foo;
|
|
end;
|
|
end|
|
|
|
|
# Redefining label
|
|
--error 1309
|
|
create procedure foo()
|
|
foo: loop
|
|
foo: loop
|
|
set @x=2;
|
|
end loop foo;
|
|
end loop foo|
|
|
|
|
# End label mismatch
|
|
--error 1310
|
|
create procedure foo()
|
|
foo: loop
|
|
set @x=2;
|
|
end loop bar|
|
|
|
|
# RETURN in FUNCTION only
|
|
--error 1313
|
|
create procedure foo()
|
|
return 42|
|
|
|
|
# Doesn't allow queries in FUNCTIONs (for now :-( )
|
|
--error 1314
|
|
create function foo() returns int
|
|
begin
|
|
declare x int;
|
|
select max(c) into x from test.t;
|
|
return x;
|
|
end|
|
|
|
|
# Wrong number of arguments
|
|
create procedure p(x int)
|
|
insert into test.t1 values (x)|
|
|
create function f(x int) returns int
|
|
return x+42|
|
|
|
|
--error 1318
|
|
call p()|
|
|
--error 1318
|
|
call p(1, 2)|
|
|
--error 1318
|
|
select f()|
|
|
--error 1318
|
|
select f(1, 2)|
|
|
|
|
drop procedure p|
|
|
drop function f|
|
|
|
|
--error 1319
|
|
create procedure p(val int, out res int)
|
|
begin
|
|
declare x int default 0;
|
|
declare continue handler for foo set x = 1;
|
|
|
|
insert into test.t1 values (val);
|
|
if (x) then
|
|
set res = 0;
|
|
else
|
|
set res = 1;
|
|
end if;
|
|
end|
|
|
|
|
--error 1319
|
|
create procedure p(val int, out res int)
|
|
begin
|
|
declare x int default 0;
|
|
declare foo condition for 1146;
|
|
declare continue handler for bar set x = 1;
|
|
|
|
insert into test.t1 values (val);
|
|
if (x) then
|
|
set res = 0;
|
|
else
|
|
set res = 1;
|
|
end if;
|
|
end|
|
|
|
|
--error 1320
|
|
create function f(val int) returns int
|
|
begin
|
|
declare x int;
|
|
|
|
set x = val+3;
|
|
end|
|
|
|
|
create function f(val int) returns int
|
|
begin
|
|
declare x int;
|
|
|
|
set x = val+3;
|
|
if x < 4 then
|
|
return x;
|
|
end if;
|
|
end|
|
|
|
|
--error 1321
|
|
select f(10)|
|
|
|
|
drop function f|
|
|
|
|
--error 1322
|
|
create procedure p()
|
|
begin
|
|
declare c cursor for insert into test.t1 values ("foo", 42);
|
|
|
|
open c;
|
|
close c;
|
|
end|
|
|
|
|
--error 1323
|
|
create procedure p()
|
|
begin
|
|
declare x int;
|
|
declare c cursor for select * into x from test.t limit 1;
|
|
|
|
open c;
|
|
close c;
|
|
end|
|
|
|
|
--error 1324
|
|
create procedure p()
|
|
begin
|
|
declare c cursor for select * from test.t;
|
|
|
|
open cc;
|
|
close c;
|
|
end|
|
|
|
|
--disable_warnings
|
|
drop table if exists t1|
|
|
--enable_warnings
|
|
create table t1 (val int)|
|
|
|
|
create procedure p()
|
|
begin
|
|
declare c cursor for select * from test.t1;
|
|
|
|
open c;
|
|
open c;
|
|
close c;
|
|
end|
|
|
--error 1325
|
|
call p()|
|
|
drop procedure p|
|
|
|
|
create procedure p()
|
|
begin
|
|
declare c cursor for select * from test.t1;
|
|
|
|
open c;
|
|
close c;
|
|
close c;
|
|
end|
|
|
--error 1326
|
|
call p()|
|
|
drop procedure p|
|
|
|
|
--error 1305
|
|
alter procedure bar3 sql security invoker|
|
|
|
|
drop table t1|
|
|
|
|
--disable_warnings
|
|
drop table if exists t1|
|
|
--enable_warnings
|
|
create table t1 (val int, x float)|
|
|
insert into t1 values (42, 3.1), (19, 1.2)|
|
|
|
|
--error 1327
|
|
create procedure p()
|
|
begin
|
|
declare x int;
|
|
declare c cursor for select * from t1;
|
|
|
|
open c;
|
|
fetch c into x, y;
|
|
close c;
|
|
end|
|
|
|
|
create procedure p()
|
|
begin
|
|
declare x int;
|
|
declare c cursor for select * from t1;
|
|
|
|
open c;
|
|
fetch c into x;
|
|
close c;
|
|
end|
|
|
--error 1328
|
|
call p()|
|
|
drop procedure p|
|
|
|
|
create procedure p()
|
|
begin
|
|
declare x int;
|
|
declare y float;
|
|
declare z int;
|
|
declare c cursor for select * from t1;
|
|
|
|
open c;
|
|
fetch c into x, y, z;
|
|
close c;
|
|
end|
|
|
--error 1328
|
|
call p()|
|
|
drop procedure p|
|
|
|
|
--error 1330
|
|
create procedure p(in x int, x char(10))
|
|
begin
|
|
end|
|
|
--error 1330
|
|
create function p(x int, x char(10))
|
|
begin
|
|
end|
|
|
|
|
--error 1331
|
|
create procedure p()
|
|
begin
|
|
declare x float;
|
|
declare x int;
|
|
end|
|
|
|
|
--error 1332
|
|
create procedure p()
|
|
begin
|
|
declare c condition for 1064;
|
|
declare c condition for 1065;
|
|
end|
|
|
|
|
--error 1333
|
|
create procedure p()
|
|
begin
|
|
declare c cursor for select * from t1;
|
|
declare c cursor for select field from t1;
|
|
end|
|
|
|
|
# USE is not allowed
|
|
--error 1336
|
|
create procedure u()
|
|
use sptmp|
|
|
|
|
# Enforced standard order of declarations
|
|
--error 1337
|
|
create procedure p()
|
|
begin
|
|
declare c cursor for select * from t1;
|
|
declare x int;
|
|
end|
|
|
--error 1337
|
|
create procedure p()
|
|
begin
|
|
declare x int;
|
|
declare continue handler for sqlstate '42S99' set x = 1;
|
|
declare foo condition for sqlstate '42S99';
|
|
end|
|
|
|
|
--error 1338
|
|
create procedure p()
|
|
begin
|
|
declare x int;
|
|
declare continue handler for sqlstate '42S99' set x = 1;
|
|
declare c cursor for select * from t1;
|
|
end|
|
|
|
|
--error 1358
|
|
create procedure p()
|
|
begin
|
|
declare continue handler for sqlexception
|
|
begin
|
|
goto L1;
|
|
end;
|
|
|
|
select field from t1;
|
|
label L1;
|
|
end|
|
|
|
|
#
|
|
# BUG#1965
|
|
#
|
|
create procedure bug1965()
|
|
begin
|
|
declare c cursor for select val from t1 order by valname;
|
|
open c;
|
|
close c;
|
|
end|
|
|
|
|
--error 1054
|
|
call bug1965()|
|
|
drop procedure bug1965|
|
|
|
|
#
|
|
# BUG#1966
|
|
#
|
|
--error 1327
|
|
select 1 into a|
|
|
|
|
#
|
|
# BUG#1654
|
|
#
|
|
--error 1314
|
|
create function bug1654()
|
|
returns int
|
|
return (select sum(t.data) from test.t2 t)|
|
|
|
|
#
|
|
# BUG#1653
|
|
#
|
|
--disable_warnings
|
|
drop table if exists t3|
|
|
--enable_warnings
|
|
create table t3 (column_1_0 int)|
|
|
|
|
create procedure bug1653()
|
|
update t3 set column_1 = 0|
|
|
|
|
--error 1054
|
|
call bug1653()|
|
|
drop table t3|
|
|
create table t3 (column_1 int)|
|
|
call bug1653()|
|
|
|
|
drop procedure bug1653|
|
|
drop table t3|
|
|
|
|
#
|
|
# BUG#2259
|
|
#
|
|
# Note: When this bug existed, it did not necessarily cause a crash
|
|
# in all builds, but valgrind did give warnings.
|
|
create procedure bug2259()
|
|
begin
|
|
declare v1 int;
|
|
declare c1 cursor for select s1 from t10;
|
|
|
|
fetch c1 into v1;
|
|
end|
|
|
|
|
--error 1326
|
|
call bug2259()|
|
|
drop procedure bug2259|
|
|
|
|
#
|
|
# BUG#2272
|
|
#
|
|
create procedure bug2272()
|
|
begin
|
|
declare v int;
|
|
|
|
update t1 set v = 42;
|
|
end|
|
|
|
|
insert into t1 values (666, 51.3)|
|
|
--error 1054
|
|
call bug2272()|
|
|
delete from t1|
|
|
drop procedure bug2272|
|
|
|
|
#
|
|
# BUG#2329
|
|
#
|
|
create procedure bug2329_1()
|
|
begin
|
|
declare v int;
|
|
|
|
insert into t1 (v) values (5);
|
|
end|
|
|
|
|
create procedure bug2329_2()
|
|
begin
|
|
declare v int;
|
|
|
|
replace t1 set v = 5;
|
|
end|
|
|
|
|
--error 1054
|
|
call bug2329_1()|
|
|
--error 1054
|
|
call bug2329_2()|
|
|
drop procedure bug2329_1|
|
|
drop procedure bug2329_2|
|
|
|
|
#
|
|
# BUG#3287
|
|
#
|
|
create function bug3287() returns int
|
|
begin
|
|
declare v int default null;
|
|
|
|
case
|
|
when v is not null then return 1;
|
|
end case;
|
|
return 2;
|
|
end|
|
|
--error 1339
|
|
select bug3287()|
|
|
drop function bug3287|
|
|
|
|
create procedure bug3287(x int)
|
|
case x
|
|
when 0 then
|
|
insert into test.t1 values (x, 0.1);
|
|
when 1 then
|
|
insert into test.t1 values (x, 1.1);
|
|
end case|
|
|
--error 1339
|
|
call bug3287(2)|
|
|
drop procedure bug3287|
|
|
|
|
#
|
|
# BUG#3297
|
|
#
|
|
--disable_warnings
|
|
drop table if exists t3|
|
|
--enable_warnings
|
|
create table t3 (s1 int, primary key (s1))|
|
|
insert into t3 values (5),(6)|
|
|
|
|
create procedure bug3279(out y int)
|
|
begin
|
|
declare x int default 0;
|
|
begin
|
|
declare exit handler for sqlexception set x = x+1;
|
|
insert into t3 values (5);
|
|
end;
|
|
if x < 2 then
|
|
set x = x+1;
|
|
insert into t3 values (6);
|
|
end if;
|
|
set y = x;
|
|
end|
|
|
|
|
set @x = 0|
|
|
--error 1062
|
|
call bug3279(@x)|
|
|
select @x|
|
|
drop procedure bug3279|
|
|
drop table t3|
|
|
|
|
#
|
|
# BUG#3339
|
|
#
|
|
--error 1049
|
|
create procedure nodb.bug3339() begin end|
|
|
|
|
#
|
|
# BUG#2653
|
|
#
|
|
create procedure bug2653_1(a int, out b int)
|
|
set b = aa|
|
|
|
|
create procedure bug2653_2(a int, out b int)
|
|
begin
|
|
if aa < 0 then
|
|
set b = - a;
|
|
else
|
|
set b = a;
|
|
end if;
|
|
end|
|
|
|
|
--error 1054
|
|
call bug2653_1(1, @b)|
|
|
--error 1054
|
|
call bug2653_2(2, @b)|
|
|
|
|
drop procedure bug2653_1|
|
|
drop procedure bug2653_2|
|
|
|
|
#
|
|
# BUG#4344
|
|
#
|
|
--error 1357
|
|
create procedure bug4344() drop procedure bug4344|
|
|
--error 1357
|
|
create procedure bug4344() drop function bug4344|
|
|
|
|
#
|
|
# BUG#3294: Stored procedure crash if table dropped before use
|
|
# (Actually, when an error occurs within an error handler.)
|
|
--disable_warnings
|
|
drop procedure if exists bug3294|
|
|
--enable_warnings
|
|
create procedure bug3294()
|
|
begin
|
|
declare continue handler for sqlexception drop table t5;
|
|
drop table t5;
|
|
end|
|
|
|
|
--error 1051
|
|
call bug3294()|
|
|
drop procedure bug3294|
|
|
|
|
|
|
drop table t1|
|
|
|
|
delimiter ;|
|