database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.6' into 10.9

Browse Source 
# Conflicts:
#	mysql-test/main/sp.result
#	mysql-test/main/sp.test
This commit is contained in:
Oleksandr Byelkin
2023-08-09 21:21:31 +02:00
parent 27dc4cd1fc 8d210fc2aa
commit f692b2b6bb
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8972,6 +8972,18 @@ select @counter;
5
drop function f1;
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*)
#