summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2021-05-03 23:26:30 +0200
committerSergei Golubchik <serg@mariadb.org>2021-05-04 09:01:55 +0200
commit5ad7f52558cb283c685322df1fcdbd10daf3c3ae (patch)
treedf71238c727173fa80e3c18f909800e52ea95e1d /sql/sql_class.h
parent1ae7673aae7f82c4e659b1337177f2696c8e45ba (diff)
downloadmariadb-git-5ad7f52558cb283c685322df1fcdbd10daf3c3ae.tar.gz
MDEV-21603 Crashing SHOW TABLES with derived table in WHERE condition
When you only need view structure, don't call handle_derived with DT_CREATE and rely on its internal hackish check to skip DT_CREATE. Because handle_derived is called from many different places, and this internal hackish check is indiscriminative. Instead, just don't ask handle_derived to do DT_CREATE if you don't want it to do DT_CREATE.
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index ce4bf67e745..e08bb3e6358 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -3469,10 +3469,6 @@ public:
{
return server_status & SERVER_STATUS_IN_TRANS;
}
- inline bool fill_derived_tables()
- {
- return !stmt_arena->is_stmt_prepare() && !lex->only_view_structure();
- }
inline bool fill_information_schema_tables()
{
return !stmt_arena->is_stmt_prepare();