database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixup merge 6e6318b29b

Browse Source
This commit is contained in:
Marko Mäkelä
2021-04-14 10:09:04 +03:00
parent ef26a30486
commit 13d0641710
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. /* 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 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 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) && derived->get_unit()->uncacheable) &&
mysql_handle_single_derived(join->thd->lex, mysql_handle_single_derived(join->thd->lex,
derived, DT_CREATE | DT_FILL)) derived, DT_CREATE | DT_FILL))
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
if (!(derived->get_unit()->uncacheable & UNCACHEABLE_DEPENDENT) || if (!(derived->get_unit()->uncacheable & UNCACHEABLE_DEPENDENT) ||
derived->is_nonrecursive_derived_with_rec_ref()) derived->is_nonrecursive_derived_with_rec_ref())
@ -12872,7 +12872,7 @@ bool JOIN_TAB::preread_init()
/* init ftfuns for just initialized derived table */ /* init ftfuns for just initialized derived table */
if (table->fulltext_searched) if (table->fulltext_searched)
if (init_ftfuncs(join->thd, join->select_lex, MY_TEST(join->order))) if (init_ftfuncs(join->thd, join->select_lex, MY_TEST(join->order)))
return TRUE; DBUG_RETURN(TRUE);
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }