Commit d19e16d4 authored by unknown's avatar unknown

SCRUM

two versions of KILL
small fix


sql/sql_select.cc:
  it's more logical to use killed here
parent f525047d
......@@ -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));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment