mirror of
https://github.com/MariaDB/server.git
synced 2025-11-15 09:02:33 +03:00
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.mysql.r18.ru:/home/hf/work/mysql-5.0.kil
This commit is contained in:
@@ -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));
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user