diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 11:12:56 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-30 11:12:56 +0300 |
| commit | 1a9b6c4c7f817155f5ce8b1a6062d0eccbfd10ec (patch) | |
| tree | c1da70f7f990dae02c5dfe70fd75299ced68873c /sql/sql_show.cc | |
| parent | 0fb84216a35046a4574dec214dcce03130a797c1 (diff) | |
| parent | b11ff3d49581d9e7b6f8b990f08e85e4d6384418 (diff) | |
| download | mariadb-git-1a9b6c4c7f817155f5ce8b1a6062d0eccbfd10ec.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 7240cb3264c..a920b236d4f 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -8724,7 +8724,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; @@ -8759,11 +8758,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); } |