database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-11-02 13:13:45 +01:00
parent 1a3859fff0 3303748fd1
commit 0946c99e7d
8 changed files with 89 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/main/subselect.result
View File

@@ -7384,6 +7384,17 @@ a
drop table t1,t2,t3; drop table t1,t2,t3;
# End of 10.2 tests # End of 10.2 tests
# #
# MDEV-29926: ASAN heap-use-after-free in Explain_query::~Explain_query
#
CREATE TABLE t (a VARCHAR(1)) CHARACTER SET utf8mb3;
EXECUTE IMMEDIATE "SELECT COUNT(*) FROM t WHERE a < (SELECT 'x')";
COUNT(*)
0
DROP TABLE t;
#
# End of 10.3 tests
#
#
# Start of 10.4 tests # Start of 10.4 tests
# #
# #

14
mysql-test/main/subselect.test
View File

@@ -6290,6 +6290,20 @@ drop table t1,t2,t3;
--echo # End of 10.2 tests --echo # End of 10.2 tests
--echo #
--echo # MDEV-29926: ASAN heap-use-after-free in Explain_query::~Explain_query
--echo #
CREATE TABLE t (a VARCHAR(1)) CHARACTER SET utf8mb3;
EXECUTE IMMEDIATE "SELECT COUNT(*) FROM t WHERE a < (SELECT 'x')";
# Cleanup
DROP TABLE t;
--echo #
--echo # End of 10.3 tests
--echo #
--echo # --echo #
--echo # Start of 10.4 tests --echo # Start of 10.4 tests

11
mysql-test/main/subselect_no_exists_to_in.result
View File

@@ -7384,6 +7384,17 @@ a
drop table t1,t2,t3; drop table t1,t2,t3;
# End of 10.2 tests # End of 10.2 tests
# #
# MDEV-29926: ASAN heap-use-after-free in Explain_query::~Explain_query
#
CREATE TABLE t (a VARCHAR(1)) CHARACTER SET utf8mb3;
EXECUTE IMMEDIATE "SELECT COUNT(*) FROM t WHERE a < (SELECT 'x')";
COUNT(*)
0
DROP TABLE t;
#
# End of 10.3 tests
#
#
# Start of 10.4 tests # Start of 10.4 tests
# #
# #

11
mysql-test/main/subselect_no_mat.result
View File

@@ -7377,6 +7377,17 @@ a
drop table t1,t2,t3; drop table t1,t2,t3;
# End of 10.2 tests # End of 10.2 tests
# #
# MDEV-29926: ASAN heap-use-after-free in Explain_query::~Explain_query
#
CREATE TABLE t (a VARCHAR(1)) CHARACTER SET utf8mb3;
EXECUTE IMMEDIATE "SELECT COUNT(*) FROM t WHERE a < (SELECT 'x')";
COUNT(*)
0
DROP TABLE t;
#
# End of 10.3 tests
#
#
# Start of 10.4 tests # Start of 10.4 tests
# #
# #

11
mysql-test/main/subselect_no_opts.result
View File

@@ -7375,6 +7375,17 @@ a
drop table t1,t2,t3; drop table t1,t2,t3;
# End of 10.2 tests # End of 10.2 tests
# #
# MDEV-29926: ASAN heap-use-after-free in Explain_query::~Explain_query
#
CREATE TABLE t (a VARCHAR(1)) CHARACTER SET utf8mb3;
EXECUTE IMMEDIATE "SELECT COUNT(*) FROM t WHERE a < (SELECT 'x')";
COUNT(*)
0
DROP TABLE t;
#
# End of 10.3 tests
#
#
# Start of 10.4 tests # Start of 10.4 tests
# #
# #

11
mysql-test/main/subselect_no_scache.result
View File

@@ -7390,6 +7390,17 @@ a
drop table t1,t2,t3; drop table t1,t2,t3;
# End of 10.2 tests # End of 10.2 tests
# #
# MDEV-29926: ASAN heap-use-after-free in Explain_query::~Explain_query
#
CREATE TABLE t (a VARCHAR(1)) CHARACTER SET utf8mb3;
EXECUTE IMMEDIATE "SELECT COUNT(*) FROM t WHERE a < (SELECT 'x')";
COUNT(*)
0
DROP TABLE t;
#
# End of 10.3 tests
#
#
# Start of 10.4 tests # Start of 10.4 tests
# #
# #

11
mysql-test/main/subselect_no_semijoin.result
View File

@@ -7375,6 +7375,17 @@ a
drop table t1,t2,t3; drop table t1,t2,t3;
# End of 10.2 tests # End of 10.2 tests
# #
# MDEV-29926: ASAN heap-use-after-free in Explain_query::~Explain_query
#
CREATE TABLE t (a VARCHAR(1)) CHARACTER SET utf8mb3;
EXECUTE IMMEDIATE "SELECT COUNT(*) FROM t WHERE a < (SELECT 'x')";
COUNT(*)
0
DROP TABLE t;
#
# End of 10.3 tests
#
#
# Start of 10.4 tests # Start of 10.4 tests
# #
# #

10
sql/sql_select.cc
View File

@@ -1204,6 +1204,15 @@ JOIN::prepare(TABLE_LIST *tables_init,
// simple check that we got usable conds // simple check that we got usable conds
dbug_print_item(conds); dbug_print_item(conds);
/*
It is hack which force creating EXPLAIN object always on runt-time arena
(because very top JOIN::prepare executes always with runtime arena, but
constant subquery like (SELECT 'x') can be called with statement arena
during prepare phase of top SELECT).
*/
if (!(thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_PREPARE))
create_explain_query_if_not_exists(thd->lex, thd->mem_root);
if (select_lex->handle_derived(thd->lex, DT_PREPARE)) if (select_lex->handle_derived(thd->lex, DT_PREPARE))
DBUG_RETURN(-1); DBUG_RETURN(-1);
@@ -1654,7 +1663,6 @@ bool JOIN::build_explain()
int JOIN::optimize() int JOIN::optimize()
{ {
int res= 0; int res= 0;
create_explain_query_if_not_exists(thd->lex, thd->mem_root);
join_optimization_state init_state= optimization_state; join_optimization_state init_state= optimization_state;
if (select_lex->pushdown_select) if (select_lex->pushdown_select)
{ {