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

Merge branch '10.11' into 11.0

Browse Source
This commit is contained in:
Oleksandr Byelkin 2023-08-10 08:09:33 +02:00
commit f8af7c6f48
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mysql-test/main/sp.result
View File

@ -8965,6 +8965,18 @@ select @counter;
5 5
drop function f1; drop function f1;
drop table t1,t2; drop table t1,t2;
#
# MDEV-31877: ASAN errors in Exec_time_tracker::get_cycles with innodb slow log verbosity
#
CREATE TABLE t1 (a INT, b INT);
INSERT INTO t1 VALUES (1,2);
SET @tmp=@@log_slow_verbosity;
SET SESSION log_slow_verbosity= 'innodb';
BEGIN NOT ATOMIC DECLARE r ROW TYPE OF t1 DEFAULT (SELECT * FROM t1); SELECT r.a; END $
r.a
1
SET SESSION log_slow_verbosity= @tmp;
DROP TABLE t1;
# #
# MDEV-28129: MariaDB UAF issue at lex_end_nops(LEX*) # MDEV-28129: MariaDB UAF issue at lex_end_nops(LEX*)
# #

16
mysql-test/main/sp.test
View File

@ -10574,6 +10574,22 @@ select @counter;
drop function f1; drop function f1;
drop table t1,t2; drop table t1,t2;
--echo #
--echo # MDEV-31877: ASAN errors in Exec_time_tracker::get_cycles with innodb slow log verbosity
--echo #
CREATE TABLE t1 (a INT, b INT);
INSERT INTO t1 VALUES (1,2);
SET @tmp=@@log_slow_verbosity;
SET SESSION log_slow_verbosity= 'innodb';
--delimiter $
BEGIN NOT ATOMIC DECLARE r ROW TYPE OF t1 DEFAULT (SELECT * FROM t1); SELECT r.a; END $
--delimiter ;
SET SESSION log_slow_verbosity= @tmp;
# Cleanup
DROP TABLE t1;
--echo # --echo #
--echo # MDEV-28129: MariaDB UAF issue at lex_end_nops(LEX*) --echo # MDEV-28129: MariaDB UAF issue at lex_end_nops(LEX*)
--echo # --echo #

3
sql/sp_head.cc
View File

@ -3885,7 +3885,6 @@ int
sp_instr_set::exec_core(THD *thd, uint *nextp) sp_instr_set::exec_core(THD *thd, uint *nextp)
{ {
int res= get_rcontext(thd)->set_variable(thd, m_offset, &m_value); int res= get_rcontext(thd)->set_variable(thd, m_offset, &m_value);
delete_explain_query(thd->lex);
*nextp = m_ip+1; *nextp = m_ip+1;
return res; return res;
} }
@ -3927,7 +3926,6 @@ sp_instr_set_row_field::exec_core(THD *thd, uint *nextp)
int res= get_rcontext(thd)->set_variable_row_field(thd, m_offset, int res= get_rcontext(thd)->set_variable_row_field(thd, m_offset,
m_field_offset, m_field_offset,
&m_value); &m_value);
delete_explain_query(thd->lex);
*nextp= m_ip + 1; *nextp= m_ip + 1;
return res; return res;
} }
@ -3975,7 +3973,6 @@ sp_instr_set_row_field_by_name::exec_core(THD *thd, uint *nextp)
int res= get_rcontext(thd)->set_variable_row_field_by_name(thd, m_offset, int res= get_rcontext(thd)->set_variable_row_field_by_name(thd, m_offset,
m_field_name, m_field_name,
&m_value); &m_value);
delete_explain_query(thd->lex);
*nextp= m_ip + 1; *nextp= m_ip + 1;
return res; return res;
} }