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

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2020-03-30 14:50:23 +03:00
parent 9eae063e79 b092d35f13
commit e2f1f88fa6
85 changed files with 1554 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_show.cc
View File

@ -8765,7 +8765,6 @@ end:
bool optimize_schema_tables_reads(JOIN *join)
{
THD *thd= join->thd;
bool result= 0;
DBUG_ENTER("optimize_schema_tables_reads");
JOIN_TAB *tab;
@ -8800,11 +8799,11 @@ bool optimize_schema_tables_reads(JOIN *join)
*/
cond= tab->cache_select->cond;
}
optimize_for_get_all_tables(thd, table_list, cond);
if (optimize_for_get_all_tables(thd, table_list, cond))
DBUG_RETURN(TRUE); // Handle OOM
}
}
DBUG_RETURN(result);
DBUG_RETURN(FALSE);
}