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 remote-tracking branch 10.5 into 10.6

Browse Source 
Notably MDEV-33290, columnstore disable stays in 10.5.
This commit is contained in:
Daniel Black
2024-01-23 15:25:42 +11:00
parent 19f3796ec3 5ce6a352b6
commit 4ef9c9bb75
5 changed files with 76 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.cc
View File

@@ -28716,7 +28716,6 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
bool distinct,const char *message)
{
THD *thd=join->thd;
select_result *result=join->result;
DBUG_ENTER("select_describe");
if (join->select_lex->pushdown_select)
@@ -28751,7 +28750,7 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
if (unit->explainable())
{
if (mysql_explain_union(thd, unit, result))
if (mysql_explain_union(thd, unit, unit->result))
DBUG_VOID_RETURN;
}
}