database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

Browse Source 
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
This commit is contained in:
stewart@willster.(none)
2006-10-25 17:24:20 +10:00
parent 0f74244d86 5926602aa7
commit a4faddc64f
30 changed files with 128 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.cc
View File

@ -538,6 +538,8 @@ JOIN::optimize()
{
if (res > 1)
{
thd->fatal_error();
error= res;
DBUG_RETURN(1);
}
if (res < 0)
@ -1796,7 +1798,12 @@ make_join_statistics(JOIN *join,TABLE_LIST *tables,COND *conds,
s->checked_keys.init();
s->needed_reg.init();
table_vector[i]=s->table=table=tables->table;
table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);// record count
error= table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
if(error)
{
table->file->print_error(error, MYF(0));
DBUG_RETURN(1);
}
table->quick_keys.clear_all();
table->reginfo.join_tab=s;
table->reginfo.not_exists_optimize=0;