diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 10:09:04 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 10:09:04 +0300 |
| commit | 13d0641710802bd57b0c0d88c9fc321932014994 (patch) | |
| tree | fdc8e5e3322e7fd71a43dc79e179b5d2984d1130 | |
| parent | ef26a304869be71099708cf7139ff60a0d4e48a3 (diff) | |
| download | mariadb-git-13d0641710802bd57b0c0d88c9fc321932014994.tar.gz | |
Fixup merge 6e6318b29b446f76f01f2ef65d1460870b607d2a
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index f5d05794e11..b4e6c505261 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2009, 2020, MariaDB Corporation. + Copyright (c) 2009, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -12854,7 +12854,7 @@ bool JOIN_TAB::preread_init() derived->get_unit()->uncacheable) && mysql_handle_single_derived(join->thd->lex, derived, DT_CREATE | DT_FILL)) - DBUG_RETURN(TRUE); + DBUG_RETURN(TRUE); if (!(derived->get_unit()->uncacheable & UNCACHEABLE_DEPENDENT) || derived->is_nonrecursive_derived_with_rec_ref()) @@ -12872,7 +12872,7 @@ bool JOIN_TAB::preread_init() /* init ftfuns for just initialized derived table */ if (table->fulltext_searched) if (init_ftfuncs(join->thd, join->select_lex, MY_TEST(join->order))) - return TRUE; + DBUG_RETURN(TRUE); DBUG_RETURN(FALSE); } |