mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +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''
185 lines
3.6 KiB
Text
185 lines
3.6 KiB
Text
# This test should work in embedded server after mysqltest is fixed
|
|
-- source include/not_embedded.inc
|
|
#
|
|
# Testing stored procedures with multiple connections,
|
|
# except security/privilege tests, they go to sp-security.test
|
|
#
|
|
|
|
connect (con1root,localhost,root,,);
|
|
connect (con2root,localhost,root,,);
|
|
connect (con3root,localhost,root,,);
|
|
|
|
connection con1root;
|
|
use test;
|
|
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
create table t1 (s1 int, s2 int, s3 int);
|
|
|
|
delimiter //;
|
|
create procedure bug4934()
|
|
begin
|
|
insert into t1 values (1,0,1);
|
|
end//
|
|
delimiter ;//
|
|
|
|
|
|
connection con2root;
|
|
use test;
|
|
|
|
call bug4934();
|
|
select * from t1;
|
|
|
|
|
|
connection con1root;
|
|
|
|
drop table t1;
|
|
create table t1 (s1 int, s2 int, s3 int);
|
|
|
|
drop procedure bug4934;
|
|
delimiter //;
|
|
create procedure bug4934()
|
|
begin
|
|
end//
|
|
delimiter ;//
|
|
|
|
|
|
connection con2root;
|
|
|
|
select * from t1;
|
|
call bug4934();
|
|
select * from t1;
|
|
|
|
connection con1root;
|
|
|
|
drop table t1;
|
|
drop procedure bug4934;
|
|
|
|
|
|
#
|
|
# BUG #9486 "Can't perform multi-update in stored procedure"
|
|
#
|
|
--disable_warnings
|
|
drop procedure if exists bug9486;
|
|
drop table if exists t1, t2;
|
|
--enable_warnings
|
|
create table t1 (id1 int, val int);
|
|
create table t2 (id2 int);
|
|
|
|
create procedure bug9486()
|
|
update t1, t2 set val= 1 where id1=id2;
|
|
call bug9486();
|
|
# Let us check that SP invocation requires write lock for t2.
|
|
connection con2root;
|
|
lock tables t2 write;
|
|
connection con1root;
|
|
send call bug9486();
|
|
connection con2root;
|
|
--sleep 2
|
|
# There should be call statement in locked state.
|
|
--replace_column 1 # 3 localhost 6 #
|
|
show processlist;
|
|
unlock tables;
|
|
connection con1root;
|
|
reap;
|
|
|
|
drop procedure bug9486;
|
|
drop table t1, t2;
|
|
|
|
#
|
|
# BUG#11158: Can't perform multi-delete in stored procedure
|
|
#
|
|
--disable_warnings
|
|
drop procedure if exists bug11158;
|
|
--enable_warnings
|
|
create procedure bug11158() delete t1 from t1, t2 where t1.id = t2.id;
|
|
create table t1 (id int, j int);
|
|
insert into t1 values (1, 1), (2, 2);
|
|
create table t2 (id int);
|
|
insert into t2 values (1);
|
|
# Procedure should work and cause proper effect (delete only first row)
|
|
call bug11158();
|
|
select * from t1;
|
|
# Also let us test that we obtain only read (and thus non exclusive) lock
|
|
# for table from which we are not going to delete rows.
|
|
connection con2root;
|
|
lock tables t2 read;
|
|
connection con1root;
|
|
call bug11158();
|
|
connection con2root;
|
|
unlock tables;
|
|
connection con1root;
|
|
# Clean-up
|
|
drop procedure bug11158;
|
|
drop table t1, t2;
|
|
|
|
#
|
|
# BUG#11554: Server crashes on statement indirectly using non-cached function
|
|
#
|
|
--disable_warnings
|
|
drop function if exists bug11554;
|
|
drop view if exists v1;
|
|
--enable_warnings
|
|
create table t1 (i int);
|
|
create function bug11554 () returns int return 1;
|
|
create view v1 as select bug11554() as f;
|
|
connection con2root;
|
|
# This should not crash server
|
|
insert into t1 (select f from v1);
|
|
# Clean-up
|
|
connection con1root;
|
|
drop function bug11554;
|
|
drop table t1;
|
|
drop view v1;
|
|
|
|
|
|
# BUG#12228
|
|
--disable_warnings
|
|
drop procedure if exists p1;
|
|
drop procedure if exists p2;
|
|
--enable_warnings
|
|
|
|
connection con1root;
|
|
delimiter |;
|
|
create table t1 (s1 int)|
|
|
create procedure p1() select * from t1|
|
|
create procedure p2()
|
|
begin
|
|
insert into t1 values (1);
|
|
call p1();
|
|
select * from t1;
|
|
end|
|
|
delimiter ;|
|
|
|
|
connection con2root;
|
|
use test;
|
|
lock table t1 write;
|
|
|
|
connection con1root;
|
|
send call p2();
|
|
|
|
connection con3root;
|
|
use test;
|
|
drop procedure p1;
|
|
create procedure p1() select * from t1;
|
|
|
|
connection con2root;
|
|
unlock tables;
|
|
|
|
connection con1root;
|
|
# Crash will be here if we hit BUG#12228
|
|
reap;
|
|
|
|
drop procedure p1;
|
|
drop procedure p2;
|
|
drop table t1;
|
|
|
|
#
|
|
# BUG#NNNN: New bug synopsis
|
|
#
|
|
#--disable_warnings
|
|
#drop procedure if exists bugNNNN;
|
|
#--enable_warnings
|
|
#create procedure bugNNNN...
|
|
|