database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Code Activity

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

Browse Source 
into deer.mysql.r18.ru:/home/hf/work/mysql-5.0.kil
This commit is contained in:
unknown
2003-04-24 08:22:56 +05:00
parent 37c9401782 d19e16d4de
commit 06e8139be7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@@ -1725,7 +1725,7 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds,
sizeof(POSITION)*join->const_tables); sizeof(POSITION)*join->const_tables);
join->best_read=1.0; join->best_read=1.0;
} }
DBUG_RETURN(join->thd->killed_errno() || get_best_combination(join)); DBUG_RETURN(join->thd->killed || get_best_combination(join));
} }