Merge work:/home/bk/mysql-4.1

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
b2eb6eab · serg@serg.mysql.com · 8439a494 · 223cf9f5 · b2eb6eab
Commit b2eb6eab authored Feb 24, 2003 by serg@serg.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

sql/sql_select.cc sql/sql_select.cc +4 -2

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1703,7 +1703,7 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds,
 	   sizeof(POSITION)*join->const_tables);
    join->best_read=1.0;
  }
-  DBUG_RETURN(get_best_combination(join));
+  DBUG_RETURN(join->thd->killed || get_best_combination(join));
 }


@@ -2532,6 +2532,8 @@ find_best(JOIN *join,table_map rest_tables,uint idx,double record_count,
 	swap(JOIN_TAB*,join->best_ref[idx],*pos);
 	find_best(join,rest_tables & ~real_table_bit,idx+1,
 		  current_record_count,current_read_time);
+        if (thd->killed)
+          return;
 	swap(JOIN_TAB*,join->best_ref[idx],*pos);
      }
      if (join->select_options & SELECT_STRAIGHT_JOIN)