Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0

into deer.mysql.r18.ru:/home/hf/work/mysql-5.0.kil

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.mysql.r18.ru:/home/hf/work/mysql-5.0.kil
06e8139b · unknown · 37c94017 · d19e16d4 · 06e8139b
Commit 06e8139b authored Apr 24, 2003 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_select.cc sql/sql_select.cc +1 -1

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