From b9688830ecb3ab528770aaa00a4b57c29859dc65 Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Mon, 10 May 2010 19:28:19 +0400 Subject: Subquery optimizations: - Better comments - Use more appropriate return types for functions - Provide handling where it was missing. --- sql/sql_join_cache.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sql/sql_join_cache.cc') diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index ee863f5ca74..33e688fae54 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -33,8 +33,6 @@ #define NO_MORE_RECORDS_IN_BUFFER (uint)(-1) -int do_jtbm_materialization_if_needed(JOIN_TAB *tab); - /***************************************************************************** * Join cache module ******************************************************************************/ @@ -1780,8 +1778,11 @@ enum_nested_loop_state JOIN_CACHE_BNL::join_matching_records(bool skip_last) /* Start retrieving all records of the joined table */ - //jtbm-todo: error handling! - do_jtbm_materialization_if_needed(join_tab); + if (do_jtbm_materialization_if_needed(join_tab)) + { + rc= NESTED_LOOP_ERROR; + goto finish; + } if ((error= join_init_read_record(join_tab))) { -- cgit v1.2.1