summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2023-05-05 11:09:46 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2023-05-05 11:09:46 +0200
commit1c394795980df537e0ff1083b330a6d900cf7717 (patch)
tree0d08597549bfd2c8cb87ff76e821295ee62ded95 /sql
parentdb3342b325f81c7f928d722a469f9ceceb6dc30d (diff)
parentb735ca47738a1d2e995a429f40afd620eb7d8843 (diff)
downloadmariadb-git-1c394795980df537e0ff1083b330a6d900cf7717.tar.gz
Merge branch '10.5' into 10.6
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index ed40c428c4f..31e3e16b397 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -13500,7 +13500,7 @@ uint check_join_cache_usage(JOIN_TAB *tab,
join->return_tab= 0;
if (tab->no_forced_join_cache)
- return 0;
+ goto no_join_cache;
/*
Don't use join cache if @@join_cache_level==0 or this table is the first