summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorhf@deer.mysql.r18.ru <>2003-04-24 08:22:11 +0500
committerhf@deer.mysql.r18.ru <>2003-04-24 08:22:11 +0500
commit3706f8b9a40d38efa754502f52cd2537763e953f (patch)
tree95b24f93d4de3245b08e9f3a4bafd084f7473d13 /sql
parenta4e065920b709029fa939be624b531def810eb2d (diff)
downloadmariadb-git-3706f8b9a40d38efa754502f52cd2537763e953f.tar.gz
SCRUM
two versions of KILL small fix
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 61d86c85972..38f1c62ec60 100644
--- 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));
}