mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 21:42:35 +01:00
0afb6ff660
(Needed for "list of pushes" web page and autopush) include/mysql.h: Fix to embedded server to be able to run tests on it libmysql/libmysql.c: Fix to embedded server to be able to run tests on it libmysqld/emb_qcache.cc: Fix to embedded server to be able to run tests on it libmysqld/embedded_priv.h: Fix to embedded server to be able to run tests on it libmysqld/lib_sql.cc: Fix to embedded server to be able to run tests on it libmysqld/libmysqld.c: Fix to embedded server to be able to run tests on it mysql-test/mysql-test-run.sh: Fix to embedded server to be able to run tests on it mysql-test/r/binlog.result: Updated test for embedded server mysql-test/r/ctype_cp932.result: Updated test for embedded server mysql-test/r/innodb.result: Updated test for embedded server mysql-test/r/mysqltest.result: Updated test for embedded server mysql-test/r/query_cache.result: Updated test for embedded server mysql-test/r/query_cache_notembedded.result: Updated test for embedded server mysql-test/r/sp-error.result: Updated test for embedded server mysql-test/r/sp.result: Updated test for embedded server mysql-test/r/subselect.result: Updated test for embedded server mysql-test/r/view.result: Updated test for embedded server mysql-test/r/view_grant.result: Updated test for embedded server mysql-test/t/backup.test: Updated test for embedded server mysql-test/t/binlog.test: Updated test for embedded server mysql-test/t/blackhole.test: Updated test for embedded server mysql-test/t/compress.test: Updated test for embedded server mysql-test/t/ctype_cp932.test: Updated test for embedded server mysql-test/t/delayed.test: Updated test for embedded server mysql-test/t/handler.test: Updated test for embedded server mysql-test/t/innodb.test: Updated test for embedded server mysql-test/t/mysql.test: Updated test for embedded server mysql-test/t/mysql_client_test.test: Updated test for embedded server mysql-test/t/mysqltest.test: Updated test for embedded server mysql-test/t/query_cache.test: Updated test for embedded server mysql-test/t/query_cache_notembedded.test: Updated test for embedded server mysql-test/t/read_only.test: Updated test for embedded server mysql-test/t/skip_grants.test: Updated test for embedded server mysql-test/t/sp-destruct.test: Updated test for embedded server mysql-test/t/sp-error.test: Updated test for embedded server mysql-test/t/sp-threads.test: Updated test for embedded server mysql-test/t/sp.test: Updated test for embedded server mysql-test/t/subselect.test: Updated test for embedded server mysql-test/t/temp_table.test: Updated test for embedded server mysql-test/t/view.test: Updated test for embedded server mysql-test/t/view_grant.test: Updated test for embedded server mysql-test/t/wait_timeout.test: Updated test for embedded server mysys/mf_dirname.c: Review fix: Don't access data outside of array mysys/my_bitmap.c: Remove compiler warnings scripts/mysql_fix_privilege_tables.sql: Add flush privileges to .sql script so that one doesn't have to reboot mysqld when one runs the mysql_fix_privilege_script sql-common/client.c: Updated test for embedded server sql/item.cc: Remove DBUG_PRINT statement that can cause crashes when running with --debug sql/mysqld.cc: Fix to embedded server to be able to run tests on it sql/protocol.cc: Fix to embedded server to be able to run tests on it (Trivial reconstruction of code) sql/protocol.h: Fix to embedded server to be able to run tests on it sql/sql_base.cc: Better comment sql/sql_class.cc: Fix to embedded server to be able to run tests on it sql/sql_class.h: Fix to embedded server to be able to run tests on it sql/sql_cursor.cc: Fix to embedded server to be able to run tests on it sql/sql_parse.cc: Fix to embedded server to be able to run tests on it Don't crash for disabled commands when using embedded server sql/sql_prepare.cc: Fix to embedded server to be able to run tests on it mysql-test/r/ctype_cp932_notembedded.result: New BitKeeper file ``mysql-test/r/ctype_cp932_notembedded.result'' mysql-test/r/innodb_notembedded.result: New BitKeeper file ``mysql-test/r/innodb_notembedded.result'' mysql-test/r/sp.result.orig: New BitKeeper file ``mysql-test/r/sp.result.orig'' mysql-test/r/sp_notembedded.result: New BitKeeper file ``mysql-test/r/sp_notembedded.result'' mysql-test/r/subselect_notembedded.result: New BitKeeper file ``mysql-test/r/subselect_notembedded.result'' mysql-test/t/ctype_cp932_notembedded.test: New BitKeeper file ``mysql-test/t/ctype_cp932_notembedded.test'' mysql-test/t/innodb_notembedded.test: New BitKeeper file ``mysql-test/t/innodb_notembedded.test'' mysql-test/t/sp.test.orig: New BitKeeper file ``mysql-test/t/sp.test.orig'' mysql-test/t/sp_notembedded.test: New BitKeeper file ``mysql-test/t/sp_notembedded.test'' mysql-test/t/subselect_notembedded.test: New BitKeeper file ``mysql-test/t/subselect_notembedded.test''
262 lines
5.3 KiB
Text
262 lines
5.3 KiB
Text
# Can't test with embedded server
|
|
-- source include/not_embedded.inc
|
|
|
|
delimiter |;
|
|
|
|
#
|
|
# BUG#4902: Stored procedure with SHOW WARNINGS leads to packet error
|
|
#
|
|
# Added tests for show grants command
|
|
--disable_warnings
|
|
drop procedure if exists bug4902|
|
|
--enable_warnings
|
|
create procedure bug4902()
|
|
begin
|
|
show grants for 'root'@'localhost';
|
|
end|
|
|
--disable_parsing
|
|
show binlog events;
|
|
show storage engines;
|
|
show master status;
|
|
show slave hosts;
|
|
show slave status;
|
|
--enable_parsing
|
|
|
|
call bug4902()|
|
|
call bug4902()|
|
|
|
|
drop procedure bug4902|
|
|
|
|
# We need separate SP for SHOW PROCESSLIST since we want use replace_column
|
|
--disable_warnings
|
|
drop procedure if exists bug4902_2|
|
|
--enable_warnings
|
|
create procedure bug4902_2()
|
|
begin
|
|
show processlist;
|
|
end|
|
|
--replace_column 1 # 6 # 3 localhost
|
|
call bug4902_2()|
|
|
--replace_column 1 # 6 # 3 localhost
|
|
call bug4902_2()|
|
|
drop procedure bug4902_2|
|
|
|
|
|
|
#
|
|
# 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|
|
|
|
|
|
|
--disable_warnings
|
|
drop table if exists t1|
|
|
--enable_warnings
|
|
create table t1 (
|
|
id char(16) not null default '',
|
|
data int not null
|
|
)|
|
|
#
|
|
# BUG#3583: query cache doesn't work for stored procedures
|
|
#
|
|
--disable_warnings
|
|
drop procedure if exists bug3583|
|
|
--enable_warnings
|
|
--disable_warnings
|
|
drop procedure if exists bug3583|
|
|
--enable_warnings
|
|
create procedure bug3583()
|
|
begin
|
|
declare c int;
|
|
|
|
select * from t1;
|
|
select count(*) into c from t1;
|
|
select c;
|
|
end|
|
|
|
|
insert into t1 values ("x", 3), ("y", 5)|
|
|
set @x = @@query_cache_size|
|
|
set global query_cache_size = 10*1024*1024|
|
|
|
|
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'|
|
|
|
|
set global query_cache_size = @x|
|
|
flush status|
|
|
flush query cache|
|
|
delete from t1|
|
|
drop procedure bug3583|
|
|
drop table t1;
|
|
|
|
#
|
|
# BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY
|
|
#
|
|
--disable_warnings
|
|
drop procedure if exists bug6807|
|
|
--enable_warnings
|
|
create procedure bug6807()
|
|
begin
|
|
declare id int;
|
|
|
|
set id = connection_id();
|
|
kill query id;
|
|
select 'Not reached';
|
|
end|
|
|
|
|
--error 1317
|
|
call bug6807()|
|
|
--error 1317
|
|
call bug6807()|
|
|
|
|
drop procedure bug6807|
|
|
|
|
|
|
#
|
|
# BUG#10100: function (and stored procedure?) recursivity problem
|
|
#
|
|
--disable_warnings
|
|
drop function if exists bug10100f|
|
|
drop procedure if exists bug10100p|
|
|
drop procedure if exists bug10100t|
|
|
drop procedure if exists bug10100pt|
|
|
drop procedure if exists bug10100pv|
|
|
drop procedure if exists bug10100pd|
|
|
drop procedure if exists bug10100pc|
|
|
--enable_warnings
|
|
# routines with simple recursion
|
|
create function bug10100f(prm int) returns int
|
|
begin
|
|
if prm > 1 then
|
|
return prm * bug10100f(prm - 1);
|
|
end if;
|
|
return 1;
|
|
end|
|
|
create procedure bug10100p(prm int, inout res int)
|
|
begin
|
|
set res = res * prm;
|
|
if prm > 1 then
|
|
call bug10100p(prm - 1, res);
|
|
end if;
|
|
end|
|
|
create procedure bug10100t(prm int)
|
|
begin
|
|
declare res int;
|
|
set res = 1;
|
|
call bug10100p(prm, res);
|
|
select res;
|
|
end|
|
|
|
|
# a procedure which use tables and recursion
|
|
create table t3 (a int)|
|
|
insert into t3 values (0)|
|
|
create view v1 as select a from t3;
|
|
create procedure bug10100pt(level int, lim int)
|
|
begin
|
|
if level < lim then
|
|
update t3 set a=level;
|
|
FLUSH TABLES;
|
|
call bug10100pt(level+1, lim);
|
|
else
|
|
select * from t3;
|
|
end if;
|
|
end|
|
|
# view & recursion
|
|
create procedure bug10100pv(level int, lim int)
|
|
begin
|
|
if level < lim then
|
|
update v1 set a=level;
|
|
FLUSH TABLES;
|
|
call bug10100pv(level+1, lim);
|
|
else
|
|
select * from v1;
|
|
end if;
|
|
end|
|
|
# dynamic sql & recursion
|
|
prepare stmt2 from "select * from t3;";
|
|
create procedure bug10100pd(level int, lim int)
|
|
begin
|
|
if level < lim then
|
|
select level;
|
|
prepare stmt1 from "update t3 set a=a+2";
|
|
execute stmt1;
|
|
FLUSH TABLES;
|
|
execute stmt1;
|
|
FLUSH TABLES;
|
|
execute stmt1;
|
|
FLUSH TABLES;
|
|
deallocate prepare stmt1;
|
|
execute stmt2;
|
|
select * from t3;
|
|
call bug10100pd(level+1, lim);
|
|
else
|
|
execute stmt2;
|
|
end if;
|
|
end|
|
|
# cursor & recursion
|
|
create procedure bug10100pc(level int, lim int)
|
|
begin
|
|
declare lv int;
|
|
declare c cursor for select a from t3;
|
|
open c;
|
|
if level < lim then
|
|
select level;
|
|
fetch c into lv;
|
|
select lv;
|
|
update t3 set a=level+lv;
|
|
FLUSH TABLES;
|
|
call bug10100pc(level+1, lim);
|
|
else
|
|
select * from t3;
|
|
end if;
|
|
close c;
|
|
end|
|
|
|
|
#end of the stack checking
|
|
set @@max_sp_recursion_depth=255|
|
|
set @var=1|
|
|
#disable log because error about stack overrun contains numbers which
|
|
#depend on a system
|
|
-- disable_result_log
|
|
-- error ER_STACK_OVERRUN_NEED_MORE
|
|
call bug10100p(255, @var)|
|
|
-- error ER_STACK_OVERRUN_NEED_MORE
|
|
call bug10100pt(1,255)|
|
|
-- error ER_STACK_OVERRUN_NEED_MORE
|
|
call bug10100pv(1,255)|
|
|
-- error ER_STACK_OVERRUN_NEED_MORE
|
|
call bug10100pd(1,255)|
|
|
-- error ER_STACK_OVERRUN_NEED_MORE
|
|
call bug10100pc(1,255)|
|
|
-- enable_result_log
|
|
set @@max_sp_recursion_depth=0|
|
|
|
|
deallocate prepare stmt2|
|
|
|
|
drop function bug10100f|
|
|
drop procedure bug10100p|
|
|
drop procedure bug10100t|
|
|
drop procedure bug10100pt|
|
|
drop procedure bug10100pv|
|
|
drop procedure bug10100pd|
|
|
drop procedure bug10100pc|
|
|
drop view v1|
|
|
|
|
delimiter ;|
|