1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-15991 Server crashes in setup_on_expr upon calling SP or function executing DML on versioned tables

Browse Source 
Do not try to set versioning conditions on every SP call. It may work
incorrectly, but it's a general bug described in MDEV-774.
This patch makes system versioning stuff consistent with other code and
also fixes a use-after-free bug.

Closes #756
This commit is contained in:
Eugene Kosov 2018-05-16 18:11:30 +03:00 committed by Sergei Golubchik
parent b1efff46cd
commit 748ef3ec91
4 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mysql-test/suite/versioning/r/select.result
View File

@ -538,6 +538,27 @@ a
select * from t1 for system_time from @t2 to @t1; select * from t1 for system_time from @t2 to @t1;
a a
drop table t1; drop table t1;
#
# MDEV-15991 Server crashes in setup_on_expr upon calling SP or function executing DML on versioned tables
#
create or replace table t1 (i int);
insert into t1 values (1);
create or replace procedure p(n int)
begin
select * from t1;
end $
call p(1);
i
1
alter table t1 add system versioning;
call p(2);
i
1
call p(3);
i
1
drop procedure p;
drop table t1;
call verify_trt_dummy(34); call verify_trt_dummy(34);
No A B C D No A B C D
1 1 1 1 1 1 1 1 1 1

18
mysql-test/suite/versioning/t/select.test
View File

@ -348,6 +348,24 @@ select * from t1 for system_time from @t1 to @t2;
select * from t1 for system_time from @t2 to @t1; select * from t1 for system_time from @t2 to @t1;
drop table t1; drop table t1;
--echo #
--echo # MDEV-15991 Server crashes in setup_on_expr upon calling SP or function executing DML on versioned tables
--echo #
create or replace table t1 (i int);
insert into t1 values (1);
--delimiter $
create or replace procedure p(n int)
begin
select * from t1;
end $
--delimiter ;
call p(1);
alter table t1 add system versioning;
call p(2);
call p(3);
drop procedure p;
drop table t1;
call verify_trt_dummy(34); call verify_trt_dummy(34);
-- source suite/versioning/common_finish.inc -- source suite/versioning/common_finish.inc

2
sql/sql_class.h
View File

@ -1007,8 +1007,6 @@ public:
{ return state == STMT_PREPARED || state == STMT_EXECUTED; } { return state == STMT_PREPARED || state == STMT_EXECUTED; }
inline bool is_conventional() const inline bool is_conventional() const
{ return state == STMT_CONVENTIONAL_EXECUTION; } { return state == STMT_CONVENTIONAL_EXECUTION; }
inline bool is_sp_execute() const
{ return is_stored_procedure; }
inline void* alloc(size_t size) { return alloc_root(mem_root,size); } inline void* alloc(size_t size) { return alloc_root(mem_root,size); }
inline void* calloc(size_t size) inline void* calloc(size_t size)

2
sql/sql_select.cc
View File

@ -725,7 +725,7 @@ int SELECT_LEX::vers_setup_conds(THD *thd, TABLE_LIST *tables)
TABLE_LIST *table; TABLE_LIST *table;
if (!thd->stmt_arena->is_conventional() && if (!thd->stmt_arena->is_conventional() &&
!thd->stmt_arena->is_stmt_prepare() && !thd->stmt_arena->is_sp_execute()) !thd->stmt_arena->is_stmt_prepare_or_first_sp_execute())
{ {
// statement is already prepared // statement is already prepared
DBUG_RETURN(0); DBUG_RETURN(0);