1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge work:/home/bk/mysql-4.1

Browse Source 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
This commit is contained in:
serg@serg.mysql.com 2003-02-24 11:58:31 +01:00
commit b2eb6eabf1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -1394,7 +1394,7 @@ static ha_rows get_quick_record_count(SQL_SELECT *select,TABLE *table,
0 ok 0 ok
1 Fatal error 1 Fatal error
*/ */
static bool static bool
make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds, make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds,
DYNAMIC_ARRAY *keyuse_array) DYNAMIC_ARRAY *keyuse_array)
@ -1703,7 +1703,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(get_best_combination(join)); DBUG_RETURN(join->thd->killed || get_best_combination(join));
} }
@ -2532,6 +2532,8 @@ find_best(JOIN *join,table_map rest_tables,uint idx,double record_count,
swap(JOIN_TAB*,join->best_ref[idx],*pos); swap(JOIN_TAB*,join->best_ref[idx],*pos);
find_best(join,rest_tables & ~real_table_bit,idx+1, find_best(join,rest_tables & ~real_table_bit,idx+1,
current_record_count,current_read_time); current_record_count,current_read_time);
if (thd->killed)
return;
swap(JOIN_TAB*,join->best_ref[idx],*pos); swap(JOIN_TAB*,join->best_ref[idx],*pos);
} }
if (join->select_options & SELECT_STRAIGHT_JOIN) if (join->select_options & SELECT_STRAIGHT_JOIN)